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

quoted

quoted

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.