File tree Expand file tree Collapse file tree 1 file changed +5
-5
lines changed Expand file tree Collapse file tree 1 file changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -75,15 +75,15 @@ These should be squashed before landing in master.
75
75
76
76
Fetch the remote first:
77
77
78
- git fetch [their-fork.git] [their-branch]
78
+ git fetch [their-fork.git] [their-branch]
79
79
80
80
Then cherry-pick the commit(s):
81
81
82
82
git cherry-pick [sha-of-commit]
83
83
84
84
If you need to edit the commit message:
85
85
86
- git cherry-pick -e [sha-of-commit]
86
+ git cherry-pick -e [sha-of-commit]
87
87
88
88
If you need to edit the changes:
89
89
@@ -93,7 +93,7 @@ If you need to edit the changes:
93
93
94
94
If it should go to the stable brach, cherry-pick it to stable:
95
95
96
- git checkout 1-8 -stable
97
- git cherry-pick -x [sha-of-commit-from-master]
96
+ git checkout 1-10 -stable
97
+ git cherry-pick -x [sha-of-commit-from-master]
98
98
99
- * NOTE: Do not cherry-pick into 1-8 -stable until you have pushed the commit from master upstream.*
99
+ * NOTE: Do not cherry-pick into 1-10 -stable until you have pushed the commit from master upstream.*
You can’t perform that action at this time.
0 commit comments