Repository: qpid-proton Updated Branches: refs/heads/master 1c22210c0 -> 1cfa05680
NO-JIRA: Go: Fix merge instructions in readme-go-get.md Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/1cfa0568 Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/1cfa0568 Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/1cfa0568 Branch: refs/heads/master Commit: 1cfa0568084b4c82a75be8b61781ca393ec5e277 Parents: 1c22210 Author: Alan Conway <[email protected]> Authored: Mon Nov 23 12:32:24 2015 -0500 Committer: Alan Conway <[email protected]> Committed: Mon Nov 23 12:32:24 2015 -0500 ---------------------------------------------------------------------- proton-c/bindings/go/src/qpid.apache.org/readme-go-get.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1cfa0568/proton-c/bindings/go/src/qpid.apache.org/readme-go-get.md ---------------------------------------------------------------------- diff --git a/proton-c/bindings/go/src/qpid.apache.org/readme-go-get.md b/proton-c/bindings/go/src/qpid.apache.org/readme-go-get.md index 23bc384..6eb1e2b 100644 --- a/proton-c/bindings/go/src/qpid.apache.org/readme-go-get.md +++ b/proton-c/bindings/go/src/qpid.apache.org/readme-go-get.md @@ -2,8 +2,14 @@ The go-only subtree of proton is maintained on the branch `go1` for the `go get` command. `go1` is special to the `go get` command, it will use that branch rather than `master` when it is present. -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 -Xsubtree=proton-c/bindings/go/src/qpid.apache.org master To see the branch description: `git config branch.go1.description` --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
