From: Johannes Schindelin via GitGitGadget Date: Tue, 07 Sep 2021 21:05:10 GMT Subject: [PATCH v3 09/11] rebase: stop mentioning the -p option in comments Message-ID: <6905c8746ba2049e9ddfa8ceff5c714559ebdb86.1631048713.git.gitgitgadget@gmail.com> In-Reply-To: From: Johannes Schindelin We no longer support `--preserve-merges`, therefore it does not make sense to keep mentioning that option, even in code comments. Helped-by: Phillip Wood Signed-off-by: Johannes Schindelin --- builtin/rebase.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/rebase.c b/builtin/rebase.c index b8eb8e8304b..c4d4cf25028 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -909,7 +909,7 @@ static int parse_opt_merge(const struct option *opt, const char *arg, int unset) return 0; } -/* -i followed by -p is still explicitly interactive, but -p alone is not */ +/* -i followed by -r is still explicitly interactive, but -r alone is not */ static int parse_opt_interactive(const struct option *opt, const char *arg, int unset) { -- gitgitgadget