1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
|
git-feature(1) -- Create/Merge feature branch
=======================================
## 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>>
## REPORTING BUGS
<<https://github.com/tj/git-extras/issues>>
## SEE ALSO
<<https://github.com/tj/git-extras>>
|
