Re: git merge --abort

From: John Tapsell <johnflux@gmail.com>
Date: Feb 20, 2009, 08:42 UTC
Message-ID: <43d8ce650902200042y13caa60dtcc55d8069d90ee4d@mail.gmail.com>
In-Reply-To: <7vljs1fqxn.fsf@gitster.siamese.dyndns.org>

2009/2/20 Junio C Hamano <gitster@pobox.com>:

Show 15 quoted lines

> 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".

Doh sorry. Yeah it has to be that long algorithm that you outlined. Can it be done with a series of currently existing commands? Can I persuade someone else to implement it ? :-)

John