Hi Phillip, On Mon, 6 Sep 2021, Phillip Wood wrote: > Hi dscho > > On 01/09/2021 12:57, Johannes Schindelin via GitGitGadget wrote: > > From: Johannes Schindelin <johannes.schindelin@xxxxxx> > > > > This option was deprecated in favor of `--rebase-merges` some time ago, > > and now we retire it. > > This all looks good to me. I did see the comment below in builtin/rebase.c > that could be tweaked if you reroll, but it is a very minor issue. > > /* -i followed by -p is still explicitly interactive, but -p alone is not */ > static int parse_opt_interactive(const struct option *opt, const char *arg, > int unset) Right, without `-p` this comment does not make sense anymore. But once I replace the `-p` by `-r`, it _does_ make sense: `git rebase -r` is not interactive, but `git rebase -ir` _is_. > I do wonder if we need these option parsing functions now but that is a > question for another day. As the function parses the `-i`/`--interactive` option, which is not going anywhere, we still need it. Thanks, Dscho
