Skip to content

Commit bb254b5

Browse files
committed
doc: update branch to master
Update the remaining markdown files to refer to the master branch. PR-URL: #1511 Reviewed-By: Jeremiah Senkpiel <[email protected]>
1 parent 7384ca8 commit bb254b5

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

COLLABORATOR_GUIDE.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -119,14 +119,14 @@ $ git rebase --abort
119119
Checkout proper target branch
120120

121121
```text
122-
$ git checkout v1.x
122+
$ git checkout master
123123
```
124124

125125
Update the tree
126126

127127
```text
128128
$ git fetch origin
129-
$ git merge --ff-only origin/v1.x
129+
$ git merge --ff-only origin/master
130130
```
131131

132132
Apply external patches
@@ -138,21 +138,21 @@ $ curl -L https://github.com/iojs/io.js/pull/xxx.patch | git am --whitespace=fix
138138
Check and re-review the changes
139139

140140
```text
141-
$ git diff origin/v1.x
141+
$ git diff origin/master
142142
```
143143

144144
Check number of commits and commit messages
145145

146146
```text
147-
$ git log origin/v1.x...v1.x
147+
$ git log origin/master...master
148148
```
149149

150150
If there are multiple commits that relate to the same feature or
151151
one with a feature and separate with a test for that feature -
152152
you'll need to squash them (or strictly speaking `fixup`).
153153

154154
```text
155-
$ git rebase -i origin/v1.x
155+
$ git rebase -i origin/master
156156
```
157157

158158
This will open a screen like this (in the default shell editor):
@@ -210,7 +210,7 @@ line.
210210
Time to push it:
211211

212212
```text
213-
$ git push origin v1.x
213+
$ git push origin master
214214
```
215215

216216
### I just made a mistake

WORKING_GROUPS.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# io.js Working Groups
22

33
io.js Working Groups are autonomous projects created by the
4-
[Technical Committee (TC)](https://github.com/iojs/io.js/blob/v1.x/GOVERNANCE.md#technical-committee).
4+
[Technical Committee (TC)](https://github.com/iojs/io.js/blob/master/GOVERNANCE.md#technical-committee).
55

66
Working Groups can be formed at any time but must be ratified by the TC.
77
Once formed the work defined in the Working Group charter is the

0 commit comments

Comments
 (0)