1.单个commit合并
git cherry-pick commit_id
commit_id到commit_idn之间,包括两端
git cherry-pick commit_id..commit_idn
git cherry-pick (commit_id..commit_idn]
挑选多个commit:
git cherry-pick commit_id commit_idx commit_idy
git cherry-pick --continue
git cherry-pick commit_id
git cherry-pick commit_id..commit_idn
git cherry-pick commit_id commit_idx commit_idy