git-feature - Man Page
Create/Merge feature branch
Examples (TL;DR)
- Create and switch to a new feature branch:
git feature feature_branch - Merge a feature branch into the current branch creating a merge commit:
git feature finish feature_branch - Merge a feature branch into the current branch squashing the changes into one commit:
git feature finish --squash feature_branch - Send changes from a specific feature branch to its remote counterpart:
git feature feature_branch --remote remote_name
Synopsis
git-feature [-a|--alias branch_prefix] [-r|--remote [remote_name]] <name>
git-feature [-a|--alias branch_prefix] finish [--squash] <name>
Description
Create/Merge the given feature branch
Options
<-a|--alias branch_prefix>
use branch_prefix instead of feature
<-r|--remote [remote_name]>
Setup a remote tracking branch using remote_name. If remote_name is not supplied, use origin by default.
<--from [start_point]>
Setup a start point when the branch created. If --from is not supplied, use the current branch by default.
<finish>
Merge and delete the feature branch.
<--squash>
Run a squash merge.
<name>
The name of the feature branch.
Examples
- Start a new feature:
$ git feature dependencies
...
$ (feature/dependencies) git commit -m "Some changes"- Finish a feature with --no-ff merge:
$ (feature/dependencies) git checkout master
$ git feature finish dependencies- Finish a feature with --squash merge:
$ (feature/dependencies) git checkout master
$ git feature finish --squash dependencies- Publish a feature upstream:
$ git feature dependencies -r upstream
- Use custom branch prefix:
$ git alias features "feature -a features"
$ git features dependencies
$ (features/dependencies) ...
$ (features/dependencies) git checkout master
$ git features finish dependencies
Author
Written by Jesús Espino <jespinog@gmail.com>
Modified by Mark Pitman <mark.pitman@gmail.com>
Modified by Carlos Prado <carlos.prado@cpradog.com>