这里是记录下自己遇到的问题。
即你提交了两笔patch,先后顺序为a–>b
git push之后发现,前一笔提交b有问题需要修改,如何修改呢?
- git revert HEAD^
- git add .
- git commit -s --amend
如果做了上面的操作之后,发现a有问题,如何操作呢?
- git reflog
- git reset (git reflog 显示的字符,即下面的加粗的字符)
比如:
ae323cb HEAD@{0}: commit (amend): Bug #991842 when rt thread enqueue,update cpu util
3d06205 HEAD@{1}: reset: moving to 3d06205
b241589 HEAD@{2}: commit (amend): Bug #991842 Revert “ANDROID: sched/rt: schedtune: Add boost retention to RT”
参考:
- https://blog.csdn.net/cqbamboo/article/details/17997217
- https://blog.csdn.net/jfkidear/article/details/17795781
thanks.