From: Patrick McCarty <pnorcks@gmail.com>
Date: Sat, 16 Jan 2010 20:24:04 +0000 (-0800)
Subject: Docs: CG: minor simplification to release/unstable branch name.
X-Git-Tag: release/2.13.12-1~119
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c6208c4c1fc4a02e29b001c1c248633bcaef3d62;p=lilypond.git

Docs: CG: minor simplification to release/unstable branch name.

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.
---

diff --git a/Documentation/contributor/release-work.itexi b/Documentation/contributor/release-work.itexi
index 209b877c2f..52610d4033 100644
--- a/Documentation/contributor/release-work.itexi
+++ b/Documentation/contributor/release-work.itexi
@@ -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