File tree Expand file tree Collapse file tree 1 file changed +7
-9
lines changed
Filter options
Expand file tree Collapse file tree 1 file changed +7
-9
lines changed
Original file line number Diff line number Diff line change @@ -204,22 +204,20 @@ Backports
204
204
When doing backports please include the branch you backported the
205
205
commit to along with the SHA in a comment on the original PR.
206
206
207
- A quick guide to how to backport a merge commit::
207
+ Assuming we have ``matplotlib `` as a read-only remote to the
208
+ matplotlib/matplotlib repo and ``DANGER `` as a read/write remote to
209
+ the matplotlib/matplotlib repo, we do a backport from master to 2.x ::
208
210
209
- git remote update
210
- git checkout target_branch
211
- git merge --ff-only matplotlib/target_branch
211
+ git fetch matplotlib
212
+ git checkout v2.x
213
+ git merge --ff-only matplotlib/v2.x
212
214
git cherry-pick -m 1 TARGET_SHA
213
215
gitk # to look at it
214
216
# local tests? (use your judgment)
215
- git push DANGER target_branch
217
+ git push DANGER v2.x
216
218
# leave a comment on PR noting sha of the resulting commit
217
219
# from the cherry-pick + branch it was moved to
218
220
219
- here ``matplotlib `` is a read-only remote to the matplotlib/matplotlib
220
- repo and ``DANGER `` is a read/write remote to the matplotlib/matplotlib
221
- repo.
222
-
223
221
These commands work on git 2.7.1.
224
222
225
223
You can’t perform that action at this time.
0 commit comments