"Phillip Wood via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > A while a go Philippe reported [1] that he was surprised 'git rebase > --keep-base' removed commits that had been cherry-picked upstream even > though to branch was not being rebased. [...] > [1] > https://lore.kernel.org/git/0EA8C067-5805-40A7-857A-55C2633B8570@xxxxxxxxx/ In the thread at [1] I said that (in [2]) I expected that --reapply-cherry-picks would be the default, but this implicit --no-reapply-cherry-picks (in order to automatically exclude certain commits) is a long-available and long-advertised feature. So I symphatize with making certain modes of rebase automatically imply --reapply-cherry-picks, but I think that either all modes (as much as possible) should imply it, or no mode should imply it. Having said that, I already looked at the code so I have included my review comments anyway (in case we do decide to have implied --reapply-cherry-picks for --keep-base but not for other cases). As for the --fork-point part, I made a comment in my reply to patch 5. [2] https://lore.kernel.org/git/20200714035104.1465772-1-jonathantanmy@xxxxxxxxxx/
