将commit从功能分支中移除
➜ suibu.github.io git:(master) git revert commitID将commit放入功能分支
➜ suibu.github.io git:(master) git cherry-pick commitID➜ suibu.github.io git:(master) git add .➜ suibu.github.io git:(master) git commit -m "message..."合并多个commit
git rebase --interactive --keep-empty commitID# 解决完冲突后git add .## 无需执行 git commitgit rebase --continue
Comments