From: John Tapsell <johnflux@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Subject: Re: git merge --abort
Date: Fri, 20 Feb 2009 08:42:34 +0000 [thread overview]
Message-ID: <43d8ce650902200042y13caa60dtcc55d8069d90ee4d@mail.gmail.com> (raw)
In-Reply-To: <7vljs1fqxn.fsf@gitster.siamese.dyndns.org>
2009/2/20 Junio C Hamano <gitster@pobox.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".
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
next prev parent reply other threads:[~2009-02-20 8:44 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-19 10:05 git merge --abort John Tapsell
2009-02-19 10:58 ` Junio C Hamano
2009-02-19 13:34 ` John Tapsell
2009-02-19 20:26 ` Jay Soffian
2009-02-20 4:47 ` John Tapsell
2009-02-20 5:24 ` Junio C Hamano
2009-02-20 8:13 ` John Tapsell
2009-02-20 8:33 ` Junio C Hamano
2009-02-20 8:42 ` John Tapsell [this message]
2009-02-21 7:28 ` Bryan Donlan
2009-02-21 8:34 ` Jakub Narebski
2009-02-21 9:18 ` Junio C Hamano
2009-02-21 10:18 ` Jakub Narebski
2009-02-23 12:41 ` John Tapsell
2009-02-24 1:36 ` Junio C Hamano
2009-02-24 1:53 ` Jakub Narebski
2009-02-24 2:01 ` Junio C Hamano
2009-02-24 9:51 ` Jakub Narebski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=43d8ce650902200042y13caa60dtcc55d8069d90ee4d@mail.gmail.com \
--to=johnflux@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).