diff options
author | Russ Cox <rsc@golang.org> | 2016-02-17 10:46:30 -0500 |
---|---|---|
committer | Russ Cox <rsc@golang.org> | 2016-02-17 18:23:12 +0000 |
commit | f997475129cb12924e34156a0529d88612695d22 (patch) | |
tree | abde58e29fcb659a6852bd2a7ad38e5979ba9d5b | |
parent | aa22c42d704f9c6d9d8e65f972ac819678629ff2 (diff) | |
download | go-f997475129cb12924e34156a0529d88612695d22.tar.gz go-f997475129cb12924e34156a0529d88612695d22.zip |
doc: mention multi-change branches in contribute.html
Fixes #13651.
Change-Id: I1d21b49e2b5bc6c507eb084d6d2553e5a9c607cf
Reviewed-on: https://go-review.googlesource.com/19552
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Chris Broadfoot <cbro@golang.org>
-rw-r--r-- | doc/contribute.html | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/doc/contribute.html b/doc/contribute.html index a321a8646f..4619c81124 100644 --- a/doc/contribute.html +++ b/doc/contribute.html @@ -198,9 +198,13 @@ prints help text, not an error. </p> <p> -Note to Git aficionados: The <code>git-codereview</code> command is not required to +<b>Note to Git aficionados:</b> +The <code>git-codereview</code> command is not required to upload and manage Gerrit code reviews. For those who prefer plain Git, the text -below gives the Git equivalent of each git-codereview command. If you do use plain +below gives the Git equivalent of each git-codereview command. +</p> + +<p>If you do use plain Git, note that you still need the commit hooks that the git-codereview command configures; those hooks add a Gerrit <code>Change-Id</code> line to the commit message and check that all Go source files have been formatted with gofmt. Even @@ -208,6 +212,12 @@ if you intend to use plain Git for daily work, install the hooks in a new Git checkout by running <code>git-codereview</code> <code>hooks</code>. </p> +<p> +The workflow described below assumes a single change per branch. +It is also possible to prepare a sequence of (usually related) changes in a single branch. +See the <a href="https://golang.org/x/review/git-codereview">git-codereview documentation</a> for details. +</p> + <h3 id="git-config">Set up git aliases</h3> <p> |