Abort a Git Merge

Question

I am working on a project using Git as the VCS. I got a branch xyz cut from the mainline branch of master. After working for a while, I committed my code and took a

Answer 1

If you do "git status" while having a merge conflict, the first thing git shows you is how to abort the merge.

Answer 2

Truth be told there are many, many resources explaining how to do this already out on the web:

Git: how to reverse-merge a commit?

Git: how to reverse-merge a commit?

Undoing Merges, from Git's blog (retrieved from archive.org's Wayback Machine)

So I guess I'll just summarize some of these:

1. git revert <merge commit hash>
   This creates an extra "revert" commit saying you undid a merge

2. git reset --hard <commit hash *before* the merge>
   This reset history to before you did the merge. If you have commits after the merge you will need to cherry-pick them on to afterwards.

But honestly this guide here is better than anything I can explain, with diagrams! :)

Answer 3

as long as you did not commit you can type

git merge --abort

just as the command line suggested.