1、单个commit只需要
git cherry-pick commitid
2、多个commit
# 转移e到f所有commit,不包含e
git cherry-pick e..f
#转移e到f所有commit,包含e
git cherry-pick e^..f
4、挑选多个commit:
git cherry-pick commit_id commit_idx commit_idy
5、合并过程中依次解决冲突后,继续合并
git cherry-pick --continue