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.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.md')
| -rw-r--r-- | doc/onboarding.md | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/doc/onboarding.md b/doc/onboarding.md index af4e2bb256..39c517e1f5 100644 --- a/doc/onboarding.md +++ b/doc/onboarding.md @@ -38,7 +38,12 @@ onboarding session. apply.whitespace fix` * Always continue to PR from your own GitHub fork * Branches in the `nodejs/node` repository are only for release lines - * See [Updating Node.js from Upstream][] + * Add the canonical nodejs repository as `upstream` remote: + * `git remote add upstream git://github.com/nodejs/node.git` + * To update from `upstream`: + * `git checkout master` + * `git remote update -p` OR `git fetch --all` + * `git merge --ff-only upstream/master` (or `REMOTENAME/BRANCH`) * Make a new branch for each PR you submit. * Membership: Consider making your membership in the Node.js GitHub organization public. This makes it easier to identify Collaborators. @@ -251,6 +256,5 @@ needs to be pointed out separately during the onboarding. [Publicizing or hiding organization membership]: https://help.github.com/articles/publicizing-or-hiding-organization-membership/ [set up the credentials]: https://github.com/nodejs/node-core-utils#setting-up-credentials [two-factor authentication]: https://help.github.com/articles/securing-your-account-with-two-factor-authentication-2fa/ -[Updating Node.js from Upstream]: ./onboarding-extras.md#updating-nodejs-from-upstream [using a TOTP mobile app]: https://help.github.com/articles/configuring-two-factor-authentication-via-a-totp-mobile-app/ [who-to-cc]: ../COLLABORATOR_GUIDE.md#who-to-cc-in-the-issue-tracker |