diff options
Diffstat (limited to 'COLLABORATOR_GUIDE.md')
| -rw-r--r-- | COLLABORATOR_GUIDE.md | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md index 20949eeefb..792dbf3d4d 100644 --- a/COLLABORATOR_GUIDE.md +++ b/COLLABORATOR_GUIDE.md @@ -119,14 +119,14 @@ $ git rebase --abort Checkout proper target branch ```text -$ git checkout v1.x +$ git checkout master ``` Update the tree ```text $ git fetch origin -$ git merge --ff-only origin/v1.x +$ git merge --ff-only origin/master ``` Apply external patches @@ -138,13 +138,13 @@ $ curl -L https://github.com/iojs/io.js/pull/xxx.patch | git am --whitespace=fix Check and re-review the changes ```text -$ git diff origin/v1.x +$ git diff origin/master ``` Check number of commits and commit messages ```text -$ git log origin/v1.x...v1.x +$ git log origin/master...master ``` If there are multiple commits that relate to the same feature or @@ -152,7 +152,7 @@ one with a feature and separate with a test for that feature - you'll need to squash them (or strictly speaking `fixup`). ```text -$ git rebase -i origin/v1.x +$ git rebase -i origin/master ``` This will open a screen like this (in the default shell editor): @@ -210,7 +210,7 @@ line. Time to push it: ```text -$ git push origin v1.x +$ git push origin master ``` ### I just made a mistake |