变基后撤消git commit

Question

I am new to all this git commit stuff. I followed these commands:

git commit -m "my message"
git fetch upstream
git rebase upstream/master

then I got conflict. I have got the problem and now want to revert this commit. How do I do that?

Answer 1

git rebase --abort会将HEAD重置为开始进行rebase操作时的位置。