"Phillip Wood via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > @@ -1240,6 +1240,12 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) > die(_("options '%s' and '%s' cannot be used together"), "--keep-base", "--onto"); > if (options.root) > die(_("options '%s' and '%s' cannot be used together"), "--keep-base", "--root"); > + /* > + * --keep-base ignores config.forkPoint as it is confusing if > + * the branch base changes when using this option. > + */ > + if (options.fork_point < 0) > + options.fork_point = 0; Hmm..doesn't forkPoint decide the set of commits to be rebased, not the point at which the new commits are created? If yes, that doesn't seem to have much to do with --keep-base.