From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 7 Sep 2021 21:05:10 +0000 (+0000)
Subject: rebase: stop mentioning the -p option in comments
X-Git-Tag: v2.34.0-rc0~53^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=82db1f8439bbde725a4dddb43f4e7c1cbe532a13;p=thirdparty%2Fgit.git

rebase: stop mentioning the -p option in comments

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 <phillip.wood123@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Reviewed-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/rebase.c b/builtin/rebase.c
index b8eb8e8304..c4d4cf2502 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)
 {