git-flow cheatsheet

created by Daniel Kummer

efficient branching using git-flow by Vincent Driessen

About

git-flow are a set of git extensions to provide high-level repository operations for Vincent Driessen's branching model. more

★ ★ ★

This cheatsheet shows the basic usage and effect of git-flow operations

★ ★ ★

Basic tips

★ ★ ★

Initialize

git flow init

Start using git-flow by initializing it inside a git repository

git flow init

You'll have to answer a few questions regarding the naming conventions for your branches.
I strongly recommend using the default values.

Features

Start a new feature

Development of new features starting from the develop branch.

Start developing a new feature with

git-flow feature start MYFEATURE

Finish up a feature

Finish the development of a feature. This action performs the following

  • Merged MYFEATURE into develop
  • Removes the feature branch
  • Switches back to develop branch
git-flow feature finish MYFEATURE

Publish a feature

Publish a feature to the remote server so it can be used by other users.

git-flow feature publish MYFEATURE

Getting a published feature

Getting a published feature from the remote server and tracking remote changes.

git-flow feature pull MYFEATURE

git-flow release

git-flow hotfix