how to do "git merge --abort"

How to abort a merge if it said there are conflicts but I do not want to (or can not) resolve it for the moment. I can not find the --abort option as that for git-rebase.

On Fri, Aug 21, 2009 at 10:51:57PM +0800, bill lam wrote:

It is spelled "git reset --merge" (though --merge was introduced in v1.6.1; prior to that, you had to use "git reset --hard").

I don't know if it is worth adding "git merge --abort" as syntactic sugar.

-Peff

Jeff King wrote:

Umm, no, you still have to use "git reset --hard".

"git reset --merge cmt" is a rough equivalent for

  git stash
  git reset --hard cmt
  git stash pop

and fills the case where you merged with (unrelated) unstaged changes, and want to discard the merge while keeping the changes.

On Fri, Aug 21, 2009 at 05:26:19PM +0200, Thomas Rast wrote:

Ah, sorry, you are right. I have never actually used "--merge", but I knew based on this thread:

  http://article.gmane.org/gmane.comp.version-control.git/102067

that the point was to carry dirty state across a reset. So I assumed you could use it to reset a failed merge while leaving dirty state in files unrelated to the merge. But it doesn't actually handle unmerged entries at all.

Thanks for correcting me.

The downside, of course, of "git reset --hard" is that it kills off any dirty state you may have wanted to keep.

-Peff

Thanks to both of you. I'll try it when the next merge conflicts.