Skip to content
AlanQuatermain edited this page Mar 28, 2013 · 8 revisions
git flow feature [list] [-v]
git flow feature start [-F] <name> [<base>]
git flow feature finish [-rFkD] [<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 [-r] <remote> [<name>]

Provides commands to manipulate feature branches.

git flow feature list

Lists the feature branches on the local repository, minus the feature/ prefixes.

Options

-v
Optional.
Display additional information about each branch's status.

git flow feature start

Creates a new feature branch.

Options

-F
Optional.
Fetch data from the origin repository before creating the new feature branch.
<name>
The name of the new feature; used to create the branch name.
<base>
Optional.
A commit on the develop branch from which to start (default uses HEAD).

git flow feature finish

Signals completion of the named feature, merging changes back into the develop branch and removing the feature branch.

Options

-r
Optional.
Perform a rebase instead of a merge (discouraged).
-F
Optional.
Fetch from the origin repository before finishing the feature branch.
-k
Optional.
Keep the feature branch after performing the merge. By default, the feature branch is deleted.
-D
Optional.
Forcibly delete the feature branch; normally, git may refuse to delete it in certain situations.
<name|nameprefix>
The name (or the beginning of the name) of the feature to finish.

git flow feature publish

Pushes the branch for the named feature to the origin and configures push/pull tracking against the new remote branch. Other users can then track the branch.

Options

<name>
The name of the feature to publish. Used to construct the feature branch name.

git flow feature track

Fetches a named feature branch published to the origin repository and sets up the local copy to track the remote.

Options

<name>
The name of the feature to track. Used to construct the feature branch name.

git flow feature diff

Show differences between the current and named feature, or between the current feature and the develop branch.

Options

<name|nameprefix>
Optional.
Either a feature name or the first few letters of a feature name.

git flow feature rebase

Rebase the named feature against the current state of the develop branch.

Options

-i
Optional.
Perform an interactive rebase.
<name|nameprefix>
Optional.
The name of the feature whose branch to rebase.

git flow feature checkout

Checkout the branch for the named feature. You can also use 'co' as an alias for 'checkout'.

Options

<name|nameprefix>
The name of the feature whose branch to check out.

git flow feature pull

Pull a feature branch from a specified remote server. This will either create a new local branch based on the feature branch from the given remote server (NOT tracking), or will update a local branch for the same feature from that server. It will fail if the current branch is a different feature branch or if it would otherwise need to perform a merge.

Options

<remote>
The remote repository from which to pull the feature branch.
<name>
Optional.
The feature name whose remote branch to pull.