Git how to reverse-merge a commit

Question

With SVN it is easy to reverse-merge a commit  but how to do that with Git

User · Answer

To revert a merge commit  you need to use  git revert -m  lt parent number gt   So for example  to revert the recent most merge commit using the parent with number 1 you would use   git revert -m 1 HEAD   To revert a merge commit before the last commit  you would do   git revert -m 1 HEAD    Use git show  lt merge commit SHA1 gt  to see the parents  the numbering is the order they appear e g  Merge  e4c54b3 4725ad2  git merge documentation  http   schacon github com git git-merge html  git merge discussion  confusing but very detailed    http   schacon github com git howto revert-a-faulty-merge txt

User · Answer

If you don t want to commit  or want to commit later  commit message will still be prepared for you  which you can also edit    git revert -n  lt commit gt

User · Answer

To create a new commit that  undoes  the changes of a past commit  use    git revert  lt commit-hash gt   It s also possible to actually remove a commit from an arbitrary point in the past by rebasing and then resetting  but you really don t want to do that if you have already pushed your commits to another repository  or someone else has pulled from you   If your previous commit is a merge commit you can run this command   git revert -m 1  lt commit-hash gt   See schacon github com git howto revert-a-faulty-merge txt for proper ways to re-merge an un-merged branch

User · Answer

git reset --hard HEAD     Use the above command to revert merge changes

User · Answer

If I understand you correctly  you re talking about doing a  svn merge -rn n-1   to back out of an earlier commit  in which case  you re probably looking for  git revert

[git] Git: how to reverse-merge a commit?

Examples related to git

Examples related to merge