Skip to content

Instantly share code, notes, and snippets.

@lifuzu

lifuzu/revert_a_merge.md

Created April 2, 2014 01:47
Show Gist options
  • Star 6 You must be signed in to star a gist
  • Fork 3 You must be signed in to fork a gist
  • Save lifuzu/9926607 to your computer and use it in GitHub Desktop.
Save lifuzu/9926607 to your computer and use it in GitHub Desktop.
Download ZIP
revert a merge commit that's already pushed to remote branch
Raw
revert_a_merge.md

The -m option specifies the parent number. This is because a merge commit has more than one parent, and Git does not know automatically which parent was the mainline, and which parent was the branch you want to un-merge.

When you view a merge commit in the output of git log, you will see its parents listed on the line that begins with Merge:

commit 8f937c683929b08379097828c8a04350b9b8e183
Merge: 8989ee0 7c6b236
Author: Ben James <ben@example.com>
Date:   Wed Aug 17 22:49:41 2011 +0100

Merge branch 'gh-pages'

Conflicts:
    README

In this situation, git revert 8f937c6 -m 1 will get you the tree as it was in 8989ee0, and git revert -m 2 will reinstate the tree as it was in 7c6b236.

@lifuzu
Copy link
Author

lifuzu commented Apr 2, 2014

https://www.kernel.org/pub/software/scm/git/docs/git-revert.html
https://www.kernel.org/pub/software/scm/git/docs/howto/revert-a-faulty-merge.txt

@lifuzu
Copy link
Author

lifuzu commented Apr 2, 2014

http://stackoverflow.com/questions/1463340/revert-multiple-git-commits

@jshields
Copy link

Thank you for the literal explanation on what the parent numbers correspond to, this is the only example I could find that actually pointed out where they appear in the log message.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment