单 commit
git cherry-pick commitid
多 commit 批量合并
bash <master>$ git merge maint~4
bash <master>$ git merge -s ours maint~3
bash <master>$ git merge maint
- reference: git - skipping specific commits when merging
git cherry-pick commitid
bash <master>$ git merge maint~4
bash <master>$ git merge -s ours maint~3
bash <master>$ git merge maint