doc: s/origin/upstream/ collaborator guide

Use `upstream` to refer to `nodejs/node` instead of `origin`, because that’s the more common setup. PR-URL: #12436 Reviewed-By: Alexey Orlenko <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Gibson Fahnestock <[email protected]> Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: James M Snell <[email protected]>
nodejs · May 2, 2017 · 077187e · 077187e
1 parent 3c59d87
commit 077187e
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md
@@ -358,11 +358,12 @@ Checkout proper target branch
 $ git checkout master
 ```
 
-Update the tree
+Update the tree (assumes your repo is set up as detailed in
+[CONTRIBUTING.md](CONTRIBUTING.md#step-1-fork))
 
 ```text
-$ git fetch origin
-$ git merge --ff-only origin/master
+$ git fetch upstream
+$ git merge --ff-only upstream/master
 ```
 
 Apply external patches
@@ -374,21 +375,21 @@ $ curl -L https://github.com/nodejs/node/pull/xxx.patch | git am --whitespace=fi
 Check and re-review the changes
 
 ```text
-$ git diff origin/master
+$ git diff upstream/master
 ```
 
 Check number of commits and commit messages
 
 ```text
-$ git log origin/master...master
+$ git log upstream/master...master
 ```
 
 If there are multiple commits that relate to the same feature or
 one with a feature and separate with a test for that feature,
 you'll need to use `squash` or `fixup`:
 
 ```text
-$ git rebase -i origin/master
+$ git rebase -i upstream/master
 ```
 
 This will open a screen like this (in the default shell editor):
@@ -447,7 +448,7 @@ commit logs, ensure that they are properly formatted, and add
 Time to push it:
 
 ```text
-$ git push origin master
+$ git push upstream master
 ```
 * Optional: Force push the amended commit to the branch you used to
 open the pull request. If your branch is called `bugfix`, then the