Git undo last commit.

Question

I merged the wrong way between two branches. I then ran the following:

git reset --hard HEAD^

I am now back at the previous commit (which is where I want to be). Was that the correct thing to do?

The bad commit is still in the repository, is that okay or should I do something else to remove it from the repository?

I have not pushed or committed anything else yet.

Answer 1

That's the right thing to do.

You can do a git gc to garbage collect disconnected commits, but it's not necessary.

Answer 2

mmmm... git revert may be is what you need

Also this article could help you.