Skip to content

Commit 1e9de0d

Browse files
LiviaMedeirosBethGriggs
authored andcommittedMay 16, 2022
doc: remove git:// protocol, adjust nits in onboarding.md
PR-URL: #43045 Refs: https://github.blog/2021-09-01-improving-git-protocol-security-github/ Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Darshan Sen <raisinten@gmail.com> Reviewed-By: Akhil Marsonya <akhil.marsonya27@gmail.com> Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>
1 parent eb630d7 commit 1e9de0d

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed
 

‎doc/contributing/backporting-to-release-lines.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ replace that with the staging branch for the targeted release line.
5454
```bash
5555
# Assuming your fork of Node.js is checked out in $NODE_DIR,
5656
# the origin remote points to your fork, and the upstream remote points
57-
# to git://github.com/nodejs/node
57+
# to git@github.com:nodejs/node.git
5858
cd $NODE_DIR
5959
# If v10.x-staging is checked out `pull` should be used instead of `fetch`
6060
git fetch upstream v10.x-staging:v10.x-staging -f

‎onboarding.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ onboarding session.
3939
* Always create a branch in your own GitHub fork for pull requests
4040
* Branches in the `nodejs/node` repository are only for release lines
4141
* Add the canonical nodejs repository as `upstream` remote:
42-
* `git remote add upstream git://github.com/nodejs/node.git`
42+
* `git remote add upstream git@github.com:nodejs/node.git`
4343
* To update from `upstream`:
4444
* `git checkout master`
45-
* `git remote update -p` OR `git fetch --all`
46-
* `git merge --ff-only upstream/master` (or `REMOTENAME/BRANCH`)
45+
* `git fetch upstream HEAD`
46+
* `git reset --hard FETCH_HEAD`
4747
* Make a new branch for each pull request you submit.
4848
* Membership: Consider making your membership in the Node.js GitHub
4949
organization public. This makes it easier to identify collaborators.
@@ -203,9 +203,9 @@ needs to be pointed out separately during the onboarding.
203203
## Exercise: Make a pull request adding yourself to the README
204204

205205
* Example:
206-
<https://github.com/nodejs/node/commit/b58fe52692659c0bc25ddbe6afa7f4ae2c7f14a8>
206+
<https://github.com/nodejs/node/commit/6669b3857f0f43ee0296eb7ac45086cd907b9e94>
207207
* For raw commit message:
208-
`git show --format=%B b58fe52692659c0bc25ddbe6afa7f4ae2c7f14a8`
208+
`git show --format=%B 6669b3857f0f43ee0296eb7ac45086cd907b9e94`
209209
* Collaborators are in alphabetical order by GitHub username.
210210
* Optionally, include your personal pronouns.
211211
* Add the `Fixes: <collaborator-nomination-issue-url>` to the commit message

0 commit comments

Comments
 (0)
Please sign in to comment.