git cherry-pick -n
如果不想git cherry-pick自动进行提交,则加参数-n即可。比如将branch2分支上的第三次提交内容合入到branch1分支上:
$ git cherry-pick 23d9422
[branch1 2c67715] [Description]:branch2 commit 3
Date: Fri Jul 13 18:37:05 2018 +0800
1 file changed, 1 insertion(+)
$
查看提交log,它自动合入了branch1分支:
$ git log --oneline -3
2c67715 [Description]:branch2 commit 3
f8bc5db [Description]:branch2 commit 2
20fe2f9 commit second
如果不想进行自动合入,则使用git cherry-pick -n:
回退上次提交,再此进行cherry-pick
$ git reset --hard HEAD~
HEAD is now at f8bc5db [Description]:branch2 commit 2
$ git cherry-pick -n 23d9422
$ git status
On branch branch1
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: only-for-branch2.txt
这时通过git status查看,发现已将branch2的提交获取但是没有合入。
![](https://img.haomeiwen.com/i4623507/f26c84c2451b44a1.png)
参考:
git cherry-pick合并某个commit https://blog.csdn.net/fightfightfight/article/details/81039050
网友评论