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 <[email protected]> Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Darshan Sen <[email protected]> Reviewed-By: Akhil Marsonya <[email protected]> Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Rafael Gonzaga <[email protected]>
nodejs · May 12, 2022 · 4d1aad2 · 4d1aad2
1 parent 8b415e8
commit 4d1aad2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/doc/contributing/backporting-to-release-lines.md b/doc/contributing/backporting-to-release-lines.md
@@ -54,7 +54,7 @@ replace that with the staging branch for the targeted release line.
    ```bash
    # Assuming your fork of Node.js is checked out in $NODE_DIR,
    # the origin remote points to your fork, and the upstream remote points
-   # to git://github.com/nodejs/node
+   # to git@github.com:nodejs/node.git
    cd $NODE_DIR
    # If v10.x-staging is checked out `pull` should be used instead of `fetch`
    git fetch upstream v10.x-staging:v10.x-staging -f

diff --git a/onboarding.md b/onboarding.md
@@ -39,11 +39,11 @@ onboarding session.
   * Always create a branch in your own GitHub fork for pull requests
     * Branches in the `nodejs/node` repository are only for release lines
   * Add the canonical nodejs repository as `upstream` remote:
-    * `git remote add upstream git://github.com/nodejs/node.git`
+    * `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`)
+    * `git fetch upstream HEAD`
+    * `git reset --hard FETCH_HEAD`
   * Make a new branch for each pull request you submit.
   * Membership: Consider making your membership in the Node.js GitHub
     organization public. This makes it easier to identify collaborators.
@@ -203,9 +203,9 @@ needs to be pointed out separately during the onboarding.
 ## Exercise: Make a pull request adding yourself to the README
 
 * Example:
-  <https://github.com/nodejs/node/commit/b58fe52692659c0bc25ddbe6afa7f4ae2c7f14a8>
+  <https://github.com/nodejs/node/commit/6669b3857f0f43ee0296eb7ac45086cd907b9e94>
   * For raw commit message:
-    `git show --format=%B b58fe52692659c0bc25ddbe6afa7f4ae2c7f14a8`
+    `git show --format=%B 6669b3857f0f43ee0296eb7ac45086cd907b9e94`
 * Collaborators are in alphabetical order by GitHub username.
 * Optionally, include your personal pronouns.
 * Add the `Fixes: <collaborator-nomination-issue-url>` to the commit message