git中cherry-pick啥意思

Posted 2023-05-15

参考技术A 直接把某一次commit拿过来，作为最新一次commit
就像是直接摘了一颗樱桃加在链表最前面，所以叫cherry-pick本回答被提问者和网友采纳

sh 使用git cherry-pick从分支中选择提交

# Move on the branch to which you want to "add" commits
git checkout dev

# Cherry-pick a single commit
git cherry-pick <hash>

# Cherry-pick multiple commits
git cherry-pick <hash> <hash> <hash>

# Cherry-pick a range of commits, both ends included
git cherry-pick <hash>^...<hash>

# in case there is a conflict, resolve it and then:
git add <file_to_merge>
git commit
git cherry-pick --continue

# In case you want to undo the cherry-picking:
git cherry-pick --abort