"Phillip Wood via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > From: Phillip Wood <phillip.wood@xxxxxxxxxxxxx> > > Given the name of the option it is confusing if --keep-base actually > changes the base of the branch without --fork-point being explicitly > given on the command line. Does it merely "imply"? As keep-base requests exactly the same base commit reused from the current history, doesn't fork-point a competing and conflicting request, i.e. "please compute an appropriate fork-point by looking at merge base with possibly rewound tips of upstream branch"? > + /* > + * --keep-base ignores config.forkPoint as it is confusing if > + * the branch base changes when using this option. > + */ The comment singles out config.forkPoint (Isn't that "rebase.forkPoint"???) as "confusing". Do we ignore rebase.forkPoint when --keep-base is given? Do we honor --fork-point from the command line when --keep-base is given? > + if (options.fork_point < 0) > + options.fork_point = 0;
