1GIT-FEATURE(1) Git Extras GIT-FEATURE(1)
2
3
4
6 git-feature - Create/Merge feature branch
7
9 git-feature [-a|--alias branch_prefix] [-r|--remote [remote_name]]
10 <name>
11 git-feature [-a|--alias branch_prefix] finish [--squash] <name>
12
14 Create/Merge the given feature branch
15
17 <-a|--alias branch_prefix>
18
19 use branch_prefix instead of feature
20
21 <-r|--remote [remote_name]>
22
23 Setup a remote tracking branch using remote_name. If remote_name is not
24 supplied, use origin by default.
25
26 <--from [start_point]>
27
28 Setup a start point when the branch created. If --from is not supplied,
29 use the current branch by default.
30
31 <finish>
32
33 Merge and delete the feature branch.
34
35 <--squash>
36
37 Run a squash merge.
38
39 <name>
40
41 The name of the feature branch.
42
44 Start a new feature:
45
46 $ git feature dependencies
47 ...
48 $ (feature/dependencies) git commit -m "Some changes"
49
50 Finish a feature with --no-ff merge:
51
52 $ (feature/dependencies) git checkout master
53 $ git feature finish dependencies
54
55 Finish a feature with --squash merge:
56
57 $ (feature/dependencies) git checkout master
58 $ git feature finish --squash dependencies
59
60 Publish a feature upstream:
61
62 $ git feature dependencies -r upstream
63
64 Use custom branch prefix:
65
66 $ git alias features "feature -a features"
67 $ git features dependencies
68 $ (features/dependencies) ...
69 $ (features/dependencies) git checkout master
70 $ git features finish dependencies
71
73 Written by Jesús Espino <jespinog@gmail.com>
74 Modified by Mark Pitman <mark.pitman@gmail.com>
75 Modified by Carlos Prado <carlos.prado@cpradog.com>
76
78 <https://github.com/tj/git-extras/issues>
79
81 <https://github.com/tj/git-extras>
82
83
84
85 November 2020 GIT-FEATURE(1)