From 06fdbcd721f0fe546b738b990f8b8cea9cbaa091 Mon Sep 17 00:00:00 2001 From: LiviaMedeiros Date: Wed, 11 May 2022 03:20:48 +0800 Subject: [PATCH] doc: remove git:// protocol, adjust nits in onboarding.md PR-URL: https://github.com/nodejs/node/pull/43045 Refs: https://github.blog/2021-09-01-improving-git-protocol-security-github/ Reviewed-By: Antoine du Hamel Reviewed-By: Rich Trott Reviewed-By: Darshan Sen Reviewed-By: Akhil Marsonya Reviewed-By: Richard Lau Reviewed-By: Luigi Pinca Reviewed-By: Rafael Gonzaga --- doc/contributing/backporting-to-release-lines.md | 2 +- onboarding.md | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/contributing/backporting-to-release-lines.md b/doc/contributing/backporting-to-release-lines.md index 389c979e2eea67..68b723c55998ee 100644 --- 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 index f17b24c50f15ba..8fd51809bcaaaa 100644 --- 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: - + * 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: ` to the commit message