A cheatsheet on the usage of git flow
Go to file
Daniel Kummer 85010abcad
Merge pull request #113 from madhank93/patch-1
fix: typo in the url
2023-11-23 11:41:27 +01:00
css Merge branch 'gh-pages' into gh-pages 2023-11-23 11:40:47 +01:00
files add commands image 2012-09-07 09:38:08 +02:00
img add commands image 2012-09-07 09:38:08 +02:00
.gitattributes Added git attributes for unification 2016-11-30 17:10:56 +01:00
.gitignore fix .gitignore 2017-12-03 12:01:19 -02:00
index.an_AN.html Add the Aragonese translation 2022-10-12 17:43:28 +02:00
index.ar_MA.html Merge branch 'gh-pages' into gh-pages 2018-10-03 15:25:39 +02:00
index.az_AZ.html Merge branch 'gh-pages' into gh-pages 2018-10-03 15:25:39 +02:00
index.ca_CA.html Merge branch 'gh-pages' into gh-pages 2018-10-03 15:25:39 +02:00
index.de_DE.html Update index.de_DE.html 2020-10-15 22:18:56 +02:00
index.el_GR.html Merge branch 'gh-pages' into gh-pages 2018-10-03 15:25:39 +02:00
index.es_ES.html Merge branch 'gh-pages' into gh-pages 2018-10-03 15:25:39 +02:00
index.fa_FA.html Merge branch 'gh-pages' into gh-pages 2023-11-23 11:40:47 +01:00
index.fr_FR.html Fix typo, case and explanation in French file 2019-10-22 21:44:38 +02:00
index.hr_HR.html Merge branch 'gh-pages' into gh-pages 2018-10-03 15:25:39 +02:00
index.html Merge branch 'gh-pages' into gh-pages 2018-10-03 15:25:39 +02:00
index.id_ID.html fix typo fitursata 2020-01-08 16:47:34 +07:00
index.it_IT.html improved intelligibility of Italian texts 2021-05-04 10:36:34 +02:00
index.ja_JP.html Fix Japanese translate about release phase 2020-02-05 21:14:06 +09:00
index.ko_KR.html docs(-): ko_KR typo fixed 2020-03-21 22:38:57 +09:00
index.lt_LT.html Merge branch 'gh-pages' into gh-pages 2018-10-03 15:25:39 +02:00
index.nl_NL.html Merge branch 'gh-pages' into gh-pages 2018-10-03 15:25:39 +02:00
index.pl_PL.html Merge branch 'gh-pages' into gh-pages 2018-10-03 15:25:39 +02:00
index.pt_BR.html Improved the hotfix arguments description 2019-07-22 12:25:07 -03:00
index.ro_RO.html Merge branch 'gh-pages' into gh-pages 2018-10-03 15:25:39 +02:00
index.ru_RU.html Add git-flow presentation on Russian language 2021-12-08 01:35:37 +05:00
index.tr_TR.html Merge branch 'gh-pages' into gh-pages 2018-10-03 15:25:39 +02:00
index.uk_UA.html Merge branch 'gh-pages' into gh-pages 2018-10-03 15:25:39 +02:00
index.vi_VN.html spelling correction 2021-07-09 11:04:31 +07:00
index.zh_CN.html Merge branch 'gh-pages' into gh-pages 2018-10-03 15:25:39 +02:00
index.zh_TW.html Fix typo. 2019-10-31 10:08:19 +08:00
README.md Fix link to cheat sheet page 2022-11-26 09:52:41 +01:00

git-flow-cheatsheet

A cheatsheet on the usage of git flow, visit http://danielkummer.github.io/git-flow-cheatsheet/

GIT FLOW

Git extensions to provide high-level repository operations for Vincent Driessen's branching model. Read more

INIT:

$ git flow init

TRACK DEVELOP REMOTELY ON GITHUB:

$ git push origin develop

FEATURES:

Use to develop new features starting from the develop branch. Merge back into develop branch waiting for a reasonable amount of features to be there before declaring it a release.

$ git flow feature
$ git flow feature start <name>
$ git flow feature finish <name>
usage: git flow feature [list] [-v]
       git flow feature start [-F] <name> [<base>]
       git flow feature finish [-rFk] <name|nameprefix>
       git flow feature publish <name>
       git flow feature track <name>
       git flow feature diff [<name|nameprefix>]
       git flow feature rebase [-i] [<name|nameprefix>]
       git flow feature checkout [<name|nameprefix>]
       git flow feature pull <remote> [<name>]

RELEASES:

Use to group together latest development (features) add a few finishing touches if necessary and send to production. All last changes will merge back to master and develop so new features will start from current release.

$ git flow release
$ git flow release start <release> [<base>]
$ git flow release finish <release>
usage: git flow release [list] [-v]
       git flow release start [-F] <version>
       git flow release finish [-Fsumpk] <version>
       git flow release publish <name>
       git flow release track <name>

HOTFIXES:

Similar to releases but the hotfix branch starts off master to avoid unvoluntary send to production of unwanted features that my be present in branches. The quick fix must be used when an important bug arises in production which must be fixed and can't wait for other features to be ready. It merges back to master and develop.

$ git flow hotfix
$ git flow hotfix start <release> [<base>]
$ git flow hotfix finish <release>
usage: git flow hotfix [list] [-v]
       git flow hotfix start [-F] <version> [<base>]
       git flow hotfix finish [-Fsumpk] <version>