单个集成patch
git am -s patch-name
批量集成patch
git am mulu(存放patch的目录)/*.patch
回到某个版本(删除patch)
git log查看COMMIT ID
git reset ID
集成patch常见错误
删除patch时再重新提交
git am –abort
git stash
git am -s patch
如仍报错
git commit -a -s 查看有哪些错误,将其重定向到files
cat file | xargs rm -rf