From: Michael J Gruber <git@drmicha.warpmail.net>
To: kusmabite@gmail.com
Cc: Erik Faye-Lund <kusmabite@googlemail.com>,
git@vger.kernel.org, Marat Radchenko <marat@slonopotamus.org>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [RFC/PATCH] rebase: Allow to turn of ignore-if-in-upstream
Date: Sat, 04 Sep 2010 17:03:22 +0200 [thread overview]
Message-ID: <4C825FBA.8070605@drmicha.warpmail.net> (raw)
In-Reply-To: <AANLkTikjTgc2OVuyFTHdnHNDq9II-lGSvmin-4EWELPg@mail.gmail.com>
Erik Faye-Lund venit, vidit, dixit 13.07.2010 21:33:
> s/of/off/ in the subject ;)
>
> On Tue, Jul 13, 2010 at 10:13 AM, Michael J Gruber
> <git@drmicha.warpmail.net> wrote:
>> git-rebase uses "format-patch --ignore-if-in-upstream" do determine
>> which commits to apply. This may or may not be desired: a user may want
>> to transplant all commits, or may opt to avoid the possibly time
>> consuming calculation of patch-ids.
>>
>> Therefore, introduce rebase.cherry (defaulting to true) and --cherry and
>> --no-cherry options (to override the config), where --cherry means the
>> current behavior and --no-cherry avoids "--ignore-if-in-upstream".
>>
>> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
>> ---
>> RFC for obvious reasons (doc, tests).
>
Pinging this one. Is there any interest? Erik is right, off course ;)
Michael
next prev parent reply other threads:[~2010-09-06 6:17 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-13 6:56 VERY slow git format-patch (tens on minutes) during rebase and rev-list during rebase -i Marat Radchenko
2010-07-13 8:12 ` Michael J Gruber
2010-07-13 8:13 ` [RFC/PATCH] rebase: Allow to turn of ignore-if-in-upstream Michael J Gruber
2010-07-13 19:33 ` Erik Faye-Lund
2010-09-04 15:03 ` Michael J Gruber [this message]
2010-09-09 8:05 ` Marat Radchenko
2010-10-13 7:56 ` [FEATURE REQUEST] allow enabling patience diff algorithm by default Marat Radchenko
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=4C825FBA.8070605@drmicha.warpmail.net \
--to=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kusmabite@gmail.com \
--cc=kusmabite@googlemail.com \
--cc=marat@slonopotamus.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).