From: Junio C Hamano <gitster@pobox.com>
To: John Tapsell <johnflux@gmail.com>
Cc: Jakub Narebski <jnareb@gmail.com>,
Bryan Donlan <bdonlan@gmail.com>,
Jay Soffian <jaysoffian@gmail.com>,
Git Mailing List <git@vger.kernel.org>,
Nanako Shiraishi <nanako3@lavabit.com>
Subject: Re: git merge --abort
Date: Mon, 23 Feb 2009 17:36:04 -0800 [thread overview]
Message-ID: <7vvdr0obuj.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: 43d8ce650902230441n51c9e5a8h722682cda778aa7a@mail.gmail.com
John Tapsell <johnflux@gmail.com> writes:
> It sounds like we have some sort of plan then. Will Nana's patch be
> committed into mainline git? Then we can add the --abort porcelain
I do not know what plan you are talking about, but that's not how the
development works. If something is merged to 'pu', and you have a cool
feature you would want to take advantage of it, you can build your cool
feature on top of that particular topic. If the result looks reasonable
they would cook for a while in 'next' for further polishing and then
finally go to 'mainline'.
I personally did not think "--keep" would need to be be part of a
reasonable "merge --abort" implementation, but I may have missed some
description of a viable design discussed on the list.
next prev parent reply other threads:[~2009-02-24 1:37 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
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 [this message]
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=7vvdr0obuj.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=bdonlan@gmail.com \
--cc=git@vger.kernel.org \
--cc=jaysoffian@gmail.com \
--cc=jnareb@gmail.com \
--cc=johnflux@gmail.com \
--cc=nanako3@lavabit.com \
/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).