Skip to content

Commit

Permalink
doc: s/origin/upstream/ collaborator guide
Browse files Browse the repository at this point in the history
Use `upstream` to refer to `nodejs/node` instead of `origin`, because
that’s the more common setup.

PR-URL: #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>
  • Loading branch information
addaleax authored and gibfahn committed May 16, 2017
1 parent e68f2b9 commit 92451a7
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions COLLABORATOR_GUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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):
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 92451a7

Please sign in to comment.