You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
This repository was archived by the owner on Jun 19, 2023. It is now read-only.
The `-b master` switch has to be added since the fork operation automatically
77
-
clones the `develop` branch of the official gitflow repository and cloning it
76
+
The `-b master` switch has to be added since the fork operation automatically
77
+
clones the `develop` branch of the official gitflow repository and cloning it
78
78
results in a local repository with just a `develop` branch.
79
79
80
80
If you do not have gitflow installed yet install it by running `make && make install`.
@@ -124,45 +124,50 @@ The ``-d`` flag will accept all defaults.
124
124
125
125
* To list/start/finish/delete feature branches, use:
126
126
127
-
128
-
git flow feature
129
-
git flow feature start <name> [<base>]
130
-
git flow feature finish <name>
131
-
git flow feature delete <name>
127
+
```shell
128
+
git flow feature
129
+
git flow feature start <name> [<base>]
130
+
git flow feature finish <name>
131
+
git flow feature delete <name>
132
+
```
132
133
133
134
For feature branches, the `<base>` arg must be a branch, when omitted it defaults to the develop branch.
134
135
135
136
* To push/pull a feature branch to the remote repository, use:
136
137
137
-
138
-
git flow feature publish <name>
139
-
git flow feature track <name>
138
+
```shell
139
+
git flow feature publish <name>
140
+
git flow feature track <name>
141
+
```
140
142
141
143
* To list/start/finish/delete release branches, use:
142
144
143
-
144
-
git flow release
145
-
git flow release start <release> [<base>]
146
-
git flow release finish <release>
147
-
git flow release delete <release>
145
+
```shell
146
+
git flow release
147
+
git flow release start <release> [<base>]
148
+
git flow release finish <release>
149
+
git flow release delete <release>
150
+
```
148
151
149
152
For release branches, the `<base>` arg must be a branch, when omitted it defaults to the develop branch.
150
153
151
154
* To list/start/finish/delete hotfix branches, use:
152
155
153
-
154
-
git flow hotfix
155
-
git flow hotfix start <release> [<base>]
156
-
git flow hotfix finish <release>
157
-
git flow hotfix delete <release>
156
+
```shell
157
+
git flow hotfix
158
+
git flow hotfix start <release> [<base>]
159
+
git flow hotfix finish <release>
160
+
git flow hotfix delete <release>
161
+
```
158
162
159
163
For hotfix branches, the `<base>` arg must be a branch, when omitted it defaults to the production branch.
160
164
161
165
* To list/start support branches, use:
162
166
163
-
164
-
git flow support
165
-
git flow support start <release> <base>
167
+
```shell
168
+
git flow support
169
+
git flow support start <release><base>
170
+
```
166
171
167
172
For support branches, the `<base>` arg must be a branch, when omitted it defaults to the production branch.
168
173
@@ -171,22 +176,26 @@ The ``-d`` flag will accept all defaults.
171
176
You can easily publish a feature you are working on. The reason can be to allow other programmers to work on it or to access it from another machine. The publish/track feature of gitflow simplify the creation of a remote branch and its tracking.
172
177
173
178
When you want to publish a feature just use:
174
-
175
-
git flow feature publish <name>
179
+
```shell
180
+
git flow feature publish <name>
181
+
```
176
182
177
183
or, if you already are into the `feature/<name>` branch, just issue:
178
-
179
-
git flow feature publish
184
+
```shell
185
+
git flow feature publish
186
+
```
180
187
181
188
Now if you execute `git branch -avv` you will see that your branch `feature/<name>` tracks `[origin/feature/<name>]`. To track the same remote branch in another clone of the same repository use:
182
-
183
-
git flow feature track <name>
189
+
```shell
190
+
git flow feature track <name>
191
+
```
184
192
185
193
This will create a local feature `feature/<name>` that tracks the same remote branch as the original one, that is `origin/feature/<name>`.
186
194
187
195
When one developer (depending on your work flow) finishes working on the feature he or she can issue `git flow feature finish <name>` and this will automatically delete the remote branch. All other developers shall then run:
188
-
196
+
```shell
189
197
git flow feature delete <name>
198
+
```
190
199
191
200
to get rid of the local feature that tracks a remote branch that no more exist.
0 commit comments