Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit f5bf2c8

Browse filesBrowse files
TrottMylesBorins
authored andcommitted
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: #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>
1 parent 09aec43 commit f5bf2c8
Copy full SHA for f5bf2c8

File tree

Expand file treeCollapse file tree

2 files changed

+6
-12
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

2 files changed

+6
-12
lines changed
Open diff view settings
Collapse file

‎doc/onboarding-extras.md‎

Copy file name to clipboardExpand all lines: doc/onboarding-extras.md
-10Lines changed: 0 additions & 10 deletions
  • Display the source diff
  • Display the rich diff
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,3 @@ need to be attached anymore, as only important bugfixes will be included.
8383
* Architecture labels
8484
* `arm`, `mips`, `s390`, `ppc`
8585
* No x86{_64}, since that is the implied default
86-
87-
## Updating Node.js from Upstream
88-
89-
* `git remote add upstream git://github.com/nodejs/node.git`
90-
91-
to update from nodejs/node:
92-
93-
* `git checkout master`
94-
* `git remote update -p` OR `git fetch --all`
95-
* `git merge --ff-only upstream/master` (or `REMOTENAME/BRANCH`)
Collapse file

‎doc/onboarding.md‎

Copy file name to clipboardExpand all lines: doc/onboarding.md
+6-2Lines changed: 6 additions & 2 deletions
  • Display the source diff
  • Display the rich diff
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,12 @@ onboarding session.
3838
apply.whitespace fix`
3939
* Always continue to PR from your own GitHub fork
4040
* Branches in the `nodejs/node` repository are only for release lines
41-
* See [Updating Node.js from Upstream][]
41+
* Add the canonical nodejs repository as `upstream` remote:
42+
* `git remote add upstream git://github.com/nodejs/node.git`
43+
* To update from `upstream`:
44+
* `git checkout master`
45+
* `git remote update -p` OR `git fetch --all`
46+
* `git merge --ff-only upstream/master` (or `REMOTENAME/BRANCH`)
4247
* Make a new branch for each PR you submit.
4348
* Membership: Consider making your membership in the Node.js GitHub
4449
organization public. This makes it easier to identify Collaborators.
@@ -251,6 +256,5 @@ needs to be pointed out separately during the onboarding.
251256
[Publicizing or hiding organization membership]: https://help.github.com/articles/publicizing-or-hiding-organization-membership/
252257
[set up the credentials]: https://github.com/nodejs/node-core-utils#setting-up-credentials
253258
[two-factor authentication]: https://help.github.com/articles/securing-your-account-with-two-factor-authentication-2fa/
254-
[Updating Node.js from Upstream]: ./onboarding-extras.md#updating-nodejs-from-upstream
255259
[using a TOTP mobile app]: https://help.github.com/articles/configuring-two-factor-authentication-via-a-totp-mobile-app/
256260
[who-to-cc]: ../COLLABORATOR_GUIDE.md#who-to-cc-in-the-issue-tracker

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.