From: Erik Faye-Lund Date: Tue, 13 Jul 2010 19:33:14 GMT Subject: Re: [RFC/PATCH] rebase: Allow to turn of ignore-if-in-upstream Message-ID: 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 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 > --- > RFC for obvious reasons (doc, tests). -- Erik "kusma" Faye-Lund