How do you fix a bad merge, and replay your good commits onto a fixed merge?

Question

I accidentally committed an unwanted file (filename.orig while resolving a merge) to my repository several commits ago, without me noticing it until now. I want

Answer 1

You can also use:

git reset HEAD file/path