Do you actually mean "revert" there or are you talking about rewinding? using "git revert <merge_commit>" is very nasty[1]. using 'git reset <before_bad_merge>

Do you actually mean "revert" there or are you talking about rewinding? using "git revert <merge_commit>" is very nasty[1]. using 'git reset <before_bad_merge> is less so. [1]http://kernel.org/pub/software/scm/git/docs/howto/revert-a-faulty-merge.txt http://kernel.org/pub/software/scm/git/docs/howto/revert-a-f...