生成patch git diff commitID1 commitID2 > ./patch/ 合并patch git am ./patch/*.patch 合并多个commit git rebase -i HEAD~n