File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -75,15 +75,15 @@ These should be squashed before landing in master.
7575
7676Fetch the remote first:
7777
78- git fetch [their-fork.git] [their-branch]
78+ git fetch [their-fork.git] [their-branch]
7979
8080Then cherry-pick the commit(s):
8181
8282 git cherry-pick [sha-of-commit]
8383
8484If you need to edit the commit message:
8585
86- git cherry-pick -e [sha-of-commit]
86+ git cherry-pick -e [sha-of-commit]
8787
8888If you need to edit the changes:
8989
@@ -93,7 +93,7 @@ If you need to edit the changes:
9393
9494If it should go to the stable brach, cherry-pick it to stable:
9595
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]
9898
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