Git/source树将分支B的特定提交移动到分支A

Question

我在开发时遇到意外。我有两次提交这就需要在分支A，但我推到分支B.所以，现在，我想搬到那些致力于分支A，然后从分行B.删除，请查看图片查看详细：

Answer 1

首先，请到branchA和cherry-pick这两个提交你想在这里选择。

$ git checkout branchA 
$ git cherry-pick <commit1>  # commit1 = 0a18e0f 
$ git cherry-pick <commit2>  # commit2 = e604ce4 

$ git push origin HEAD   # push to remote 

现在，通过revert或rebase删除branchB的两次提交。回复更好，因为它不会改变git历史。

还原：

$ git checkout branchB 
$ git revert <commit1> 
$ git revert <commit2> 
$ git push origin HEAD 

再次基于：

$ git checkout branchB 
$ git rebase -i efb2443   # go back to the commit before the two commmits you want to remove 

Now comment out (adding `#` before the commit hash) the two commits you want to remove. 

$ git push -f origin HEAD  # you need to force(-f) push as history is changed here by rebasing