From: Russ Cox Date: Wed, 6 Jan 2016 20:23:47 +0000 (-0500) Subject: doc: discuss copyright changes in contribute.html X-Git-Tag: go1.6beta2~115 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=19e27c731b0e2fa97d049f5e6400698bc36ae3e4;p=gostls13.git doc: discuss copyright changes in contribute.html Fixes #12542. Change-Id: Icd0fa84d891d6b1feab9b4d4dd319cdf1e6d6c48 Reviewed-on: https://go-review.googlesource.com/18336 Reviewed-by: Brad Fitzpatrick --- diff --git a/doc/contribute.html b/doc/contribute.html index 5533731415..a321a8646f 100644 --- a/doc/contribute.html +++ b/doc/contribute.html @@ -81,7 +81,7 @@ discussed below, helps manage the code review process through a Google-hosted system called Gerrit.

-

Set up authentication for code review

+

Set up authentication for code review

Gerrit uses Google Accounts for authentication. If you don't have @@ -120,7 +120,7 @@ Your secret authentication token is now in a .gitcookie file and Git is configured to use this file.

-

Register with Gerrit

+

Register with Gerrit

Now that you have your authentication token, @@ -132,7 +132,7 @@ to Google Accounts. Sign in using the same Google Account you used above. That is all that is required.

-

Contributor License Agreement

+

Contributor License Agreement

Gerrit serves as the gatekeeper and uses your e-mail address as the key. To send your first change to the Go project from a given address, @@ -167,7 +167,14 @@ you can create one by clicking "New Contributor Agreement" and following the ste This rigmarole only needs to be done for your first submission for each email address.

-

Install the git-codereview command

+

+If the copyright holder for the code you are submitting changes—for example, +if you start contributing code on behalf of a new company—please send email +to let us know, so that we can make sure an appropriate agreement is completed +and update the AUTHORS file. +

+ +

Install the git-codereview command

Now install the git-codereview command by running, @@ -201,7 +208,7 @@ if you intend to use plain Git for daily work, install the hooks in a new Git checkout by running git-codereview hooks.

-

Set up git aliases

+

Set up git aliases

The git-codereview command can be run directly from the shell @@ -243,7 +250,7 @@ To install them, copy this text into your Git configuration file sync = codereview sync -

Understanding the git-codereview command

+

Understanding the git-codereview command

After installing the git-codereview command, you can run

@@ -256,7 +263,7 @@ to learn more about its commands. You can also read the command documentation.

-

Switch to the master branch

+

Switch to the master branch

Most Go installations use a release branch, but new changes should @@ -276,7 +283,7 @@ $ git sync git pull -r.)

-

Make a change

+

Make a change

The entire checked-out tree is writable. @@ -405,7 +412,7 @@ Do not edit or delete it. runs git commit --amend.)

-

Mail the change for review

+

Mail the change for review

Once the change is ready, mail it out for review: @@ -455,7 +462,7 @@ remote: New Changes: remote: https://go-review.googlesource.com/99999 math: improved Sin, Cos and Tan precision for very large arguments -

Reviewing code

+

Reviewing code

Running git mail will send an email to you and the @@ -467,7 +474,7 @@ You must reply through the web interface. (Unlike with the old Rietveld review system, replying by mail has no effect.)

-

Revise and upload

+

Revise and upload

You must respond to review comments through the web interface. @@ -494,7 +501,7 @@ You can see a list of your pending changes by running git change <branch>.

-

Synchronize your client

+

Synchronize your client

While you were working, others might have submitted changes to the repository. @@ -612,7 +619,7 @@ Then run git rebase --continue to restore the change commit.

-

Reviewing code by others

+

Reviewing code by others

You can import a change proposed by someone else into your local Git repository. @@ -629,7 +636,7 @@ $ git fetch https://go.googlesource.com/review refs/changes/21/1221/1 && To revert, change back to the branch you were working in.

-

Submit the change after the review

+

Submit the change after the review

After the code has been LGTM'ed, an approver may @@ -648,7 +655,7 @@ the commit hashes in the repository will be changed by the submit operation.

-

More information

+

More information

In addition to the information here, the Go community maintains a CodeReview wiki page.