[50/50] [abbrv] qpid-proton git commit: NO-JIRA: update reamde-branch.md with correct merge instructions.

[ac...@apache.org]

NO-JIRA: update reamde-branch.md with correct merge instructions.


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/e1a83ee2
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/e1a83ee2
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/e1a83ee2

Branch: refs/heads/go1
Commit: e1a83ee2528b61f847df550d1e48279250cbb0d0
Parents: 8dc93cd
Author: Alan Conway <ac...@redhat.com>
Authored: Fri Oct 23 10:25:15 2015 -0400
Committer: Alan Conway <ac...@redhat.com>
Committed: Fri Oct 23 10:25:15 2015 -0400

----------------------------------------------------------------------
 readme-branch.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/e1a83ee2/readme-branch.md
----------------------------------------------------------------------
diff --git a/readme-branch.md b/readme-branch.md
index b488eea..85e64f1 100644
--- a/readme-branch.md
+++ b/readme-branch.md
@@ -1,7 +1,9 @@
 `go1` is a special branch for the `go get` command, it contains just the Go subtree of proton.
 
-Created with: `git subtree split --prefix=proton-c/bindings/go/src/qpid.apache.org -b go1`
-Update with:  `git checkout go1; git merge -s subtree master`
+Created with:
+    git subtree split --prefix=proton-c/bindings/go/src/qpid.apache.org -b go1
+
+Update with:
+    git checkout go1; git merge -s recursive -X subtree=proton-c/bindings/go/src/qpid.apache.org master
 
-To see the branch description: `git config branch.go1.description`
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org