-Changes to Go must be reviewed before they are submitted,
+Changes to Go must be reviewed before they are accepted,
no matter who makes the change.
-(In exceptional cases, such as fixing a build, the review can
-follow shortly after submitting.)
A custom git command called git-codereview,
discussed below, helps manage the code review process through a Google-hosted
instance of the code review
@@ -77,49 +75,51 @@ system called Gerrit.
-The Git code hosting server and Gerrit code review server both use a Google
-Account to authenticate. You therefore need a Google Account to proceed.
-(If you can use the account to
-sign in at google.com,
-you can use it to sign in to the code review server.)
-The email address you use with the code review system
-will be recorded in the change log
-and in the CONTRIBUTORS file.
-You can create a Google Account
-associated with any address where you receive email.
+Gerrit uses Google Accounts for authentication. If you don't have
+a Google Account, you can create an account which
+includes
+a new Gmail email account or create an account associated
+with your existing
+email address.
-Visit the site go.googlesource.com -and log in using your Google Account. -Click on the "Generate Password" link that appears at the top of the page. +The email address associated with the Google Account you use will be recorded in +the change log +and in the contributors file.
-Click the radio button that says "Only go.googlesource.com"
-to use this authentication token only for the Go project.
+To set up your account in Gerrit, visit
+go.googlesource.com
+and click on "Generate Password" in the page's top right menu bar.
-Further down the page is a box containing commands to install
-the authentication cookie in file called .gitcookies in your home
-directory.
-Copy the text for the commands into a Unix shell window to execute it.
-That will install the authentication token.
+You will be redirected to accounts.google.com to sign in.
+Once signed in, you are returned back to go.googlesource.com to "Configure Git". +Follow the instructions on the page. (If you are on a Windows computer, you should instead follow the instructions in the yellow box to run the command.)
+
+Your secret authentication token is now in a .gitcookie file
+and Git is configured to use this file.
+
-Now that you have a Google account and the authentication token, -you need to register your account with Gerrit, the code review system. -To do this, visit golang.org/cl -and log in using the same Google Account you used above. +Now that you have your authentication token, +you need to register your account with Gerrit. +To do this, visit + +go-review.googlesource.com/login/. You will immediately be redirected +to Google Accounts. Sign in using the same Google Account you used above. That is all that is required.
@@ -130,7 +130,7 @@ Now install thegit-codereview command by running,
-go get -u golang.org/x/review/git-codereview +$ go get -u golang.org/x/review/git-codereview
@@ -482,7 +482,7 @@ $ git sync Failed to merge in the changes. Patch failed at 0023 math: improved Sin, Cos and Tan precision for very large arguments The copy of the patch that failed is found in: - /home/you/repo/.git/rebase-apply/patch + /home/you/repo/.git/rebase-apply/patch When you have resolved this problem, run "git rebase --continue". If you prefer to skip this patch, run "git rebase --skip" instead. @@ -505,15 +505,15 @@ The output will look something like this:
rebase in progress; onto a24c3eb You are currently rebasing branch 'mcgillicutty' on 'a24c3eb'. - (fix conflicts and then run "git rebase --continue") - (use "git rebase --skip" to skip this patch) - (use "git rebase --abort" to check out the original branch) + (fix conflicts and then run "git rebase --continue") + (use "git rebase --skip" to skip this patch) + (use "git rebase --abort" to check out the original branch) Unmerged paths: - (use "git reset HEAD <file>..." to unstage) - (use "git add <file>..." to mark resolution) + (use "git reset HEAD <file>..." to unstage) + (use "git add <file>..." to mark resolution) - both modified: sin.go + both modified: sin.go
@@ -530,9 +530,9 @@ might turn up:
arg = scale(arg)
<<<<<<< HEAD
- if arg > 1e9 {
+ if arg < 1e9 {
=======
- if arg > 1e10 {
+ if arg &lh; 1e10 {
>>>>>>> mcgillicutty
largeReduce(arg)
@@ -546,7 +546,7 @@ to remove the markers and leave the correct code:
arg = scale(arg)
- if arg > 1e10 {
+ if arg < 1e10 {
largeReduce(arg)
@@ -577,7 +577,7 @@ It should look something like this:
-$ git fetch https://go.googlesource.com/review refs/changes/21/1221/1 && git checkout FETCH_HEAD +$ git fetch https://go.googlesource.com/review refs/changes/21/1221/1 && git checkout FETCH_HEAD