黄舟2017-04-22 09:02:08
“想從b中還原a改過的內容”,如果是撤銷分支合併操作,請嘗試git reset/revert {commit}
可以先用git reflog
查看HEAD指針變更,例如:
de51e3d HEAD@{0}: merge nnn: Fast-forward
4430e82 HEAD@{1}: checkout: moving from nnn to master
de51e3d HEAD@{2}: commit: commit2
4430e82 HEAD@{3}: checkout: moving from master to nnn
4430e82 HEAD@{4}: commit (initial): test
然後例如git reset HEAD@{2}
返回某一次提交