Skip to content

Commit 077187e

Browse files
addaleaxevanlucas
authored andcommitted
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]>
1 parent 3c59d87 commit 077187e

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

COLLABORATOR_GUIDE.md

+8-7
Original file line numberDiff line numberDiff line change
@@ -358,11 +358,12 @@ Checkout proper target branch
358358
$ git checkout master
359359
```
360360

361-
Update the tree
361+
Update the tree (assumes your repo is set up as detailed in
362+
[CONTRIBUTING.md](CONTRIBUTING.md#step-1-fork))
362363

363364
```text
364-
$ git fetch origin
365-
$ git merge --ff-only origin/master
365+
$ git fetch upstream
366+
$ git merge --ff-only upstream/master
366367
```
367368

368369
Apply external patches
@@ -374,21 +375,21 @@ $ curl -L https://github.com/nodejs/node/pull/xxx.patch | git am --whitespace=fi
374375
Check and re-review the changes
375376

376377
```text
377-
$ git diff origin/master
378+
$ git diff upstream/master
378379
```
379380

380381
Check number of commits and commit messages
381382

382383
```text
383-
$ git log origin/master...master
384+
$ git log upstream/master...master
384385
```
385386

386387
If there are multiple commits that relate to the same feature or
387388
one with a feature and separate with a test for that feature,
388389
you'll need to use `squash` or `fixup`:
389390

390391
```text
391-
$ git rebase -i origin/master
392+
$ git rebase -i upstream/master
392393
```
393394

394395
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
447448
Time to push it:
448449

449450
```text
450-
$ git push origin master
451+
$ git push upstream master
451452
```
452453
* Optional: Force push the amended commit to the branch you used to
453454
open the pull request. If your branch is called `bugfix`, then the

0 commit comments

Comments
 (0)