1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

doc: s/origin/upstream/ collaborator guide

Browse Source 
Use `upstream` to refer to `nodejs/node` instead of `origin`, because
that’s the more common setup.

PR-URL: https://github.com/nodejs/node/pull/12436
Reviewed-By: Alexey Orlenko <eaglexrlnk@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
Anna Henningsen 2017-04-16 00:59:22 +02:00 committed by James M Snell
parent 97a77288ce
commit 42d0f8bf27
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
COLLABORATOR_GUIDE.md
View File

@ -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,13 +375,13 @@ $ 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
@ -388,7 +389,7 @@ 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