Git Flow

Installation

https://danielkummer.github.io/git-flow-cheatsheet/#setup

Configuration

https://danielkummer.github.io/git-flow-cheatsheet/#getting_started

git flow init

Using the default values is the recommended way to go except you having existing branch that you have to stick with.

Feature

https://danielkummer.github.io/git-flow-cheatsheet/#features

Release

https://danielkummer.github.io/git-flow-cheatsheet/#release

Hotfix

https://danielkummer.github.io/git-flow-cheatsheet/#hotfixes git hotfix start A.B.C.D # https://gist.github.com/JamesMGreene/cdd0ac49f90c987e45ac#create-a-hotfix-branch

Publish a hotfix branch

The command is git flow hotfix publish A.B.C.D but your mileage may vary. If it does not exist, this is the case on MacOS for instance, then use instead git push origin hotfix/A.B.C.D

- git hotfix finish C.T.t.h # https://gist.github.com/JamesMGreene/cdd0ac49f90c987e45ac#finalize-a-hotfix-branch

Hotfix and Release Tag

Release and hotfix tags are added exclusively on the master branch. Git flow does this for you when finishing a hotfix/feature branch, so you don't have to!