rebase: stop mentioning the -p option in comments

dscho · gitster · commit 82db1f8439bb · 2021-09-07T21:45:33.000-07:00
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 &lt;phillip.wood123@gmail.com&gt;
Signed-off-by: Johannes Schindelin &lt;johannes.schindelin@gmx.de&gt;
Reviewed-by: Ævar Arnfjörð Bjarmason &lt;avarab@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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)
 {

Original file line number	Diff line number	Diff line change
`@@ -909,7 +909,7 @@ static int parse_opt_merge(const struct option opt, const char arg, int unset)`
`909`	`909`	`return 0;`
`910`	`910`	`}`
`911`	`911`
`912`		`-/* -i followed by -p is still explicitly interactive, but -p alone is not */`
	`912`	`+/* -i followed by -r is still explicitly interactive, but -r alone is not */`
`913`	`913`	`static int parse_opt_interactive(const struct option opt, const char arg,`
`914`	`914`	`int unset)`
`915`	`915`	`{`