Re: [RFC] should `git rebase --keep-base` imply `--reapply-cherry-picks` ?

From: Denton Liu <liu.denton@gmail.com>
Date: Jul 15, 2020, 03:32 UTC
Message-ID: <20200715033216.GA11770@generichostname>
In-Reply-To: <20200714035104.1465772-1-jonathantanmy@google.com>

On Mon, Jul 13, 2020 at 08:51:04PM -0700, Jonathan Tan wrote:

Show 13 quoted lines

> > > How would a change that made '--reapply-cherry-picks' be the default when using 'keep-base'
> > > be received ?
> > 
> > I'm somewhat surprised that --no-reapply-cherry-picks is the default. I
> > would argue that it _shouldn't_ be the default at all. It's an
> > optimisation for when no --onto or --keep-base are specified but it
> > definitely can cause problems otherwise, as we've seen.
> 
> When I encountered this feature, it was a surprise to me too, but this
> has been documented as a feature for a long time (e.g. see the man page
> for 2.1.4 from 2014 [2] - search for "RECOVERING FROM UPSTREAM REBASE").
> 
> [2] https://git-scm.com/docs/git-rebase/2.1.4

Ah, I was mistaken. Thanks for the correction.