Better backport commands #115
Description
I wonder if backporting instructions would be more helpful if instead of:
git checkout 3.6.x
git pull
git cherry-pick -x -m1 1728207ffbad5baea1e77e4005230632bf6f16a6
git commit -am 'Backport PR #15279: Update benchmark reporter snapshots'
git push YOURFORK 3.6.x:auto-backport-of-pr-15279-on-3.6.xit was:
git checkout 3.6.x
# (change 1)
git pull # if on a fork, use `git fetch upstream && git merge upstream/3.6.x`
# (change 2)
git checkout -b backport-of-pr-15279-on-3.6.x
git cherry-pick -x -m1 1728207ffbad5baea1e77e4005230632bf6f16a6
git commit -am 'Backport PR #15279: Update benchmark reporter snapshots'
# (change 3)
git push --set-upstream origin backport-of-pr-15279-on-3.6.xWhy?
- Larger projects often work using forks where
git pullis often not enough - Creating a new branch early avoids having to reset our old branch when doing multiple backports
- Is not strictly required for users with
push.autoSetupRemotebut I personally find it safer to have an explicit target
What do you all think?