]> git.donarmstrong.com Git - lilypond.git/commitdiff
Docs: CG: minor simplification to release/unstable branch name.
authorPatrick McCarty <pnorcks@gmail.com>
Sat, 16 Jan 2010 20:24:04 +0000 (12:24 -0800)
committerPatrick McCarty <pnorcks@gmail.com>
Sat, 16 Jan 2010 20:24:04 +0000 (12:24 -0800)
The `origin' part of the branch name is not technically needed in this
situation.

If you don't have a *local* branch named `release/unstable', then you
would need to `origin' part.

Documentation/contributor/release-work.itexi

index 209b877c2feb65396c79ebef28e251a532b05c72..52610d40332b22923419388bf54809b1ea1e5b5c 100644 (file)
@@ -345,7 +345,7 @@ after 2.13.11; I need a chance to test these instructions)
 
 6. switch back to master and get the updated news:
   git checkout master
-  git merge origin/release/unstable
+  git merge release/unstable
 
 7. update VERSION, commit, push.
   VERSION = what you just did +0.0.1