如何取消母版上的提交并将其移到分支

Question

I got a problem. I have done a couple of commits on master. But I made a mistake. I need to do these commits on branch_a. How can I cancel the commits on master and move them to branch_a.

Answer 1

Assuming no one else has already seen your changes to master and built something on top of them:

git checkout branch_a
git cherry-pick <commit sha>   # for each commit you want on branch a
git checkout master
git reset <commit sha you want to move master back to>

If someone has already built stuff on top of your accidental master commits, then you'll want to git revert them instead of using reset .

Answer 2

If you just have a couple commits, then cherry picking them might be the easiest option. You can find the hashes of the commits via git log master . Then do the following.

git checkout branch_a
git cherry-pick COMMIT_HASH_1
git cherry-pick COMMIT_HASH_2
...
git checkout master
git reset --hard COMMIT_HASH_BEFORE

Where all COMMIT_HASH_# are the commits you wish to move to branch_a and COMMIT_HASH_BEFORE is the commit hash from before your erroneous commits. (Note that this will throw away any uncommitted changes in your working directory.)

Note that if you've already pushed the changes to master and other people might have worked with the branch, you'll instead want to git revert the same commits you cherry picked, otherwise you'll cause problems for others working on the branch. (Revert simply creates a new commit which undoes the previous commit.)

Answer 3

Best thing imo is to reset the master branch but keep your changes. Using cherry-pick will taint the repo with new commits. Assuming you have made two commits:

git checkout master
git reset --soft HEAD~2
git checkout branch_a
git commit -m "foo"

Resetting with --soft means your changes will be kept staged and it will put git in the state as it looked before you made the commits, so you only need to switch branch and re-commit your changes.