On Fri, Oct 7, 2016 at 1:26 PM, Nick Coghlan <ncogh...@gmail.com> wrote: > On 7 October 2016 at 11:55, Chris Angelico <ros...@gmail.com> wrote: >> If you want to, you can 'git cherry-pick -x 142a57', which will add a >> linking comment to the commit that it creates, saying where it came >> from. > > Recommending the use of referenced cherry picks sounds like a good idea to me. > > It may also be worth linking to > https://www.python.org/dev/peps/pep-0512/#commit-multi-release-changes-in-bugfix-branch-first > from this section of the devguide to help explain why we recommend > using the "work on master, cherry pick to maintenance branches" > approach.
git checkout master git cherry-pick footnote git show Check out the branch you want to cherry-pick into. $ git checkout 3.6 Grab the commit you want $ git cherry-pick -x 142a57 Make sure it looks good, and then push. :) ChrisA _______________________________________________ core-workflow mailing list core-workflow@python.org https://mail.python.org/mailman/listinfo/core-workflow This list is governed by the PSF Code of Conduct: https://www.python.org/psf/codeofconduct
