mirror of
https://github.com/danielkummer/git-flow-cheatsheet.git
synced 2024-11-22 07:54:03 +01:00
692526856a
Fixed the link which was pointing to github.com instead of github.io - also use http/ssl against http
86 lines
2.3 KiB
Markdown
86 lines
2.3 KiB
Markdown
git-flow-cheatsheet
|
|
===================
|
|
|
|
A cheatsheet on the usage of git flow, visit [https://danielkummer.github.io/git-flow-cheatsheet/](https://danielkummer.github.io/git-flow-cheatsheet/)
|
|
|
|
GIT FLOW
|
|
========
|
|
|
|
Git extensions to provide high-level repository operations for Vincent Driessen's branching model. [Read more](http://nvie.com/posts/a-successful-git-branching-model/)
|
|
|
|
|
|
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>
|
|
```
|