From: Jonathan Nieder <jrnieder@gmail.com>
Date: Thu, 21 Oct 2010 23:30:11 GMT
Subject: Re: [PATCHv4 00/21] git notes merge
Message-ID: <20101021233011.GA13779@burratino>
In-Reply-To: <7vaam7rv49.fsf@alter.siamese.dyndns.org>

Junio C Hamano wrote:
> Sverre Rabbelier <srabbelier@gmail.com> writes:

>> Can someone comment on whether "git reset --merge" is a good
>> implementation of "git merge --abort"?
[...]
> I think it depends on in what state you started from and how the merge
> operation stopped.  If your index was clean, probably yes, but "git reset
> --merge" may not be something you may want to do if the merge stopped
> because you had previously added something.

I suppose it would be safe if one checks that MERGE_HEAD is present
first?

It would apply to failed cherry-picks, too.  Not sure if that's a
good or a bad thing.