Reordering of commits

Question

I\'m currently working on a branch and want some commits to merge into other branches:

    a-b-c-d-e-f-g (branchA)
   /
--o-x-x-x-x-x-x-x-x-x-x (master)
   \         


        

Answer 1

git rebase is what you want. Check out the --interactive option.