diff options
| author | Rich Trott <rtrott@gmail.com> | 2018-05-29 20:15:41 -0700 |
|---|---|---|
| committer | Rich Trott <rtrott@gmail.com> | 2018-06-01 14:01:10 +0200 |
| commit | dce6d53e6b0c8dfc72eaaf096f7a2ebed775e5b7 (patch) | |
| tree | 510a65c0100c2fc0a3de61a4fc73a2ae787eb12f /doc/onboarding-extras.md | |
| parent | 7dca3297bce9c19a0451be1b130c8fcab564fe04 (diff) | |
| download | android-node-v8-dce6d53e6b0c8dfc72eaaf096f7a2ebed775e5b7.tar.gz android-node-v8-dce6d53e6b0c8dfc72eaaf096f7a2ebed775e5b7.tar.bz2 android-node-v8-dce6d53e6b0c8dfc72eaaf096f7a2ebed775e5b7.zip | |
doc: move upstream information to onboarding doc
Move information about setting `upstream` remote and updating from
`upstream` out of `onboarding-extras` and into `onboarding`. Previously,
a link was provided in `onboarding` to the section. This puts all the
git setup information for Collaborator onboardings in one place.
PR-URL: https://github.com/nodejs/node/pull/21029
Reviewed-By: Jon Moss <me@jonathanmoss.me>
Reviewed-By: Vse Mozhet Byt <vsemozhetbyt@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Diffstat (limited to 'doc/onboarding-extras.md')
| -rw-r--r-- | doc/onboarding-extras.md | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/doc/onboarding-extras.md b/doc/onboarding-extras.md index 74317c7e2b..c9fbc56ad0 100644 --- a/doc/onboarding-extras.md +++ b/doc/onboarding-extras.md @@ -83,13 +83,3 @@ need to be attached anymore, as only important bugfixes will be included. * Architecture labels * `arm`, `mips`, `s390`, `ppc` * No x86{_64}, since that is the implied default - -## Updating Node.js from Upstream - -* `git remote add upstream git://github.com/nodejs/node.git` - -to update from nodejs/node: - -* `git checkout master` -* `git remote update -p` OR `git fetch --all` -* `git merge --ff-only upstream/master` (or `REMOTENAME/BRANCH`) |