From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 21 Oct 2010 23:20:22 GMT
Subject: Re: [PATCHv4 00/21] git notes merge
Message-ID: <7vaam7rv49.fsf@alter.siamese.dyndns.org>
In-Reply-To: <AANLkTi=YJd023C3rX_G+NEM_0N-nZqd0uP7yyTSt1tHj@mail.gmail.com>

Sverre Rabbelier <srabbelier@gmail.com> writes:

> Can someone comment on whether "git reset --merge" is a good
> implementation of "git merge --abort"? If we can get an Ack from
> someone I'd love to see this implemented.

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.