Excellent. I’m going to update the post to make sure people read your comments so that the knowledge is shared. Thank you for following up on this.

I’ve used reset –hard to clean out my current working set and get back to last commit… just didn’t think about it in this case. i was so fixated on “revert” (from my svn experience) that I couldn’t see past the git revert command.

@qrush responded to your tweet and his solution is easier:

Just create a new branch from the commit on master, prior to the merge, delete master and rename the new branch to master. this will work if you haven’t deleted the topic you merged into master.

http://www.kernel.org/pub/software/scm/git/docs/howto/revert-a-faulty-merge.txt summarizes this situation. Wicked stuff.

I’ll be researching this problem in more depth

i just merged BranchA into Master and realized that I didn’t want to do that… when i run “git revert HEAD^” on master, I get this message:

“fatal: commit (hash#) is a merge but no -m option was given.”

then when i try the -m option i get

“error: switch ‘m’ expects a numerical value” … for “parent number” … umm…. what?

Yep. That’s another way to do it. You’ve actually saved me the time of writing a post for that. I’m going to update this post and make sure people read your comments.

Thank you.

The git manpages contain documentation on how to recover from an upstream rebase.

http://www.kernel.org/pub/software/scm/git/docs/git-rebase.html

> git log –oneline -3
123456 foo
567890 bar
abcdef baz

# Say you want to undo the “bar” commit
> git rebase –interactive abcdef

# Your editor opens, allowing you to specify which commits to delete or even edit!
pick 123456 foo
pick 567890 bar
pick abcdef baz

# Delete the line containing “bar” and save your changes. Exit the editor.

# Rebasing…

> git log
ef3478 foo
abcdef baz

Done!

@Adam
I mention that at the bottom of the post, but re-iteration never hurts. Thanks.