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>
Johannes Schindelin committed
Sep 7, 2021 at 21:05 UTC
82db1f8439bbde725a4dddb43f4e7c1cbe532a13
1 file changed
+1
-1
builtin/rebase.c
+1
-1
@@ -909,7 +909,7 @@ static int parse_opt_merge(const struct option *opt, const char *arg, int unset)
909
return 0;
910
}
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
static int parse_opt_interactive(const struct option *opt, const char *arg,
914
int unset)
915
{