@@ -358,11 +358,12 @@ Checkout proper target branch
358
358
$ git checkout master
359
359
```
360
360
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 ) )
362
363
363
364
``` text
364
- $ git fetch origin
365
- $ git merge --ff-only origin /master
365
+ $ git fetch upstream
366
+ $ git merge --ff-only upstream /master
366
367
```
367
368
368
369
Apply external patches
@@ -374,21 +375,21 @@ $ curl -L https://github.com/nodejs/node/pull/xxx.patch | git am --whitespace=fi
374
375
Check and re-review the changes
375
376
376
377
``` text
377
- $ git diff origin /master
378
+ $ git diff upstream /master
378
379
```
379
380
380
381
Check number of commits and commit messages
381
382
382
383
``` text
383
- $ git log origin /master...master
384
+ $ git log upstream /master...master
384
385
```
385
386
386
387
If there are multiple commits that relate to the same feature or
387
388
one with a feature and separate with a test for that feature,
388
389
you'll need to use ` squash ` or ` fixup ` :
389
390
390
391
``` text
391
- $ git rebase -i origin /master
392
+ $ git rebase -i upstream /master
392
393
```
393
394
394
395
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
447
448
Time to push it:
448
449
449
450
``` text
450
- $ git push origin master
451
+ $ git push upstream master
451
452
```
452
453
* Optional: Force push the amended commit to the branch you used to
453
454
open the pull request. If your branch is called ` bugfix ` , then the
0 commit comments