From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 20 Feb 2009 08:33:40 GMT
Subject: Re: git merge --abort
Message-ID: <7vljs1fqxn.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <43d8ce650902200013q4aca6b2na27092e0825f969a@mail.gmail.com>

John Tapsell <johnflux@gmail.com> writes:

> 2009/2/20 Junio C Hamano <gitster@pobox.com>:
> <snip>
>>    $ edit ;# unrelated local changes are still here
>>    $ git pull ;# or merge or whatever
>>    ... oops, large conflict ...
>>    ... look and see if it can easily be resolved ...
>>    ... otherwise
>>    $ git merge --abort
>
> Can I just confirm - at this stage, "git merge --abort" would be a
> "git reset --hard HEAD" ?

Not at all.  Please re-read my previous message that begins with "Not at
all".