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.

-Note to Git aficionados: The git-codereview command is not required to +Note to Git aficionados: +The git-codereview 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. +

+ +

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 Change-Id 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 git-codereview hooks.

+

+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 git-codereview documentation for details. +

+

Set up git aliases