1,554
edits
(Correct instructions) |
(→Branching for major release: annotate tags) |
||
Line 27: | Line 27: | ||
** <code>git commit -m "RELEASE: This is 2.2.0pre" -a</code> | ** <code>git commit -m "RELEASE: This is 2.2.0pre" -a</code> | ||
* Create annotated tag desc/2.2.0pre on that commit and push | * Create annotated tag desc/2.2.0pre on that commit and push | ||
** <code>git tag -m "Mark 2.2.0pre" desc/2.2.0pre</code> | ** <code>git tag -a -m "Mark 2.2.0pre" desc/2.2.0pre</code> | ||
** <code>git push origin tag desc/2.2.0pre branch-2-2:branch-2-2</code> | ** <code>git push origin tag desc/2.2.0pre branch-2-2:branch-2-2</code> | ||
* Increase version on master to 2.3.0git, and commit | * Increase version on master to 2.3.0git, and commit | ||
Line 34: | Line 34: | ||
** <code>git commit -m "RELEASE: This is 2.3.0git" -a</code> | ** <code>git commit -m "RELEASE: This is 2.3.0git" -a</code> | ||
* Create annotated tag desc/2.3.0git on that commit and push | * Create annotated tag desc/2.3.0git on that commit and push | ||
** <code>git tag -m "Mark 2.3.0git" desc/2.3.0git</code> | ** <code>git tag -a -m "Mark 2.3.0git" desc/2.3.0git</code> | ||
** <code>git push origin tag desc/2.3.0git master</code> | ** <code>git push origin tag desc/2.3.0git master</code> | ||
* Update buildbot | * Update buildbot |