Re: how to do "git merge --abort"

From: Thomas Rast <trast@student.ethz.ch>
Date: Aug 21, 2009, 15:26 UTC
Message-ID: <200908211726.21593.trast@student.ethz.ch>
In-Reply-To: <20090821151926.GE6850@coredump.intra.peff.net>

Jeff King wrote:

Show 8 quoted lines

> On Fri, Aug 21, 2009 at 10:51:57PM +0800, bill lam wrote:
> 
> > 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.
> 
> It is spelled "git reset --merge" (though --merge was introduced in
> v1.6.1; prior to that, you had to use "git reset --hard").

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.

-- 
Thomas Rast
trast@{inf,student}.ethz.ch