git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [RFC/PATCH] rebase: Allow to turn of ignore-if-in-upstream

From
Erik Faye-Lund <kusmabite@googlemail.com>
Date
Jul 13, 2010, 19:33 UTC
Message-ID
<AANLkTikjTgc2OVuyFTHdnHNDq9II-lGSvmin-4EWELPg@mail.gmail.com>
In-Reply-To
<645d8a9bf671937c1a6962b49cf1c512e0af0d82.1279008702.git.git@drmicha.warpmail.net>
s/of/off/ in the subject ;)

On Tue, Jul 13, 2010 at 10:13 AM, Michael J Gruber <git@drmicha.warpmail.net> wrote:

Show 12 quoted lines
> 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).
-- 
Erik "kusma" Faye-Lund
Previous: Michael J GruberNext: Michael J Gruber
Message 4 of 7 in “VERY slow git format-patch (tens on minutes) during rebase and rev-list during rebase -i”
  1. Marat RadchenkoJul 13, 2010
  2. Michael J GruberJul 13, 2010
  3. rebase: Allow to turn of ignore-if-in-upstreamMichael J Gruber, Jul 13, 2010
  4. Erik Faye-LundJul 13, 2010
  5. Michael J GruberSep 4, 2010
  6. Marat RadchenkoSep 9, 2010
  7. [FEATURE REQUEST] allow enabling patience diff algorithm by defaultMarat Radchenko, Oct 13, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.