Skip to content

Commit dc74482

Browse files
committed
task primer: minor changes on maint creation
1 parent ea43dda commit dc74482

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

docs/task-oriented-primer.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,12 +224,12 @@ $ git checkout `maint`
224224
(maint) $ git branch maint-2.6.4
225225
```
226226

227-
Make a new maintenance branch:
227+
Update the current maintenance branch:
228228

229229
```
230230
$ git checkout maint
231231
(maint) $ git merge --ff-only master
232-
(maint) $ git push --set-upstream origin +maint
232+
(maint) $ git push origin maint
233233
```
234234

235235
NOTE: If the merge fails because the branch cannot be fast-forwarded, then it is possible some fixes on `maint` were

0 commit comments

Comments
 (0)