@@ -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