File tree 2 files changed +7
-7
lines changed
2 files changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -119,14 +119,14 @@ $ git rebase --abort
119
119
Checkout proper target branch
120
120
121
121
``` text
122
- $ git checkout v1.x
122
+ $ git checkout master
123
123
```
124
124
125
125
Update the tree
126
126
127
127
``` text
128
128
$ git fetch origin
129
- $ git merge --ff-only origin/v1.x
129
+ $ git merge --ff-only origin/master
130
130
```
131
131
132
132
Apply external patches
@@ -138,21 +138,21 @@ $ curl -L https://github.com/iojs/io.js/pull/xxx.patch | git am --whitespace=fix
138
138
Check and re-review the changes
139
139
140
140
``` text
141
- $ git diff origin/v1.x
141
+ $ git diff origin/master
142
142
```
143
143
144
144
Check number of commits and commit messages
145
145
146
146
``` text
147
- $ git log origin/v1.x...v1.x
147
+ $ git log origin/master...master
148
148
```
149
149
150
150
If there are multiple commits that relate to the same feature or
151
151
one with a feature and separate with a test for that feature -
152
152
you'll need to squash them (or strictly speaking ` fixup ` ).
153
153
154
154
``` text
155
- $ git rebase -i origin/v1.x
155
+ $ git rebase -i origin/master
156
156
```
157
157
158
158
This will open a screen like this (in the default shell editor):
@@ -210,7 +210,7 @@ line.
210
210
Time to push it:
211
211
212
212
``` text
213
- $ git push origin v1.x
213
+ $ git push origin master
214
214
```
215
215
216
216
### I just made a mistake
Original file line number Diff line number Diff line change 1
1
# io.js Working Groups
2
2
3
3
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 ) .
5
5
6
6
Working Groups can be formed at any time but must be ratified by the TC.
7
7
Once formed the work defined in the Working Group charter is the
You can’t perform that action at this time.
0 commit comments