Skip to content

Commit 82db1f8

Browse files
dschogitster
authored andcommitted
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 <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]> Reviewed-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent ff8d6e5 commit 82db1f8

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

builtin/rebase.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -909,7 +909,7 @@ static int parse_opt_merge(const struct option *opt, const char *arg, int unset)
909909
return 0;
910910
}
911911

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 */
913913
static int parse_opt_interactive(const struct option *opt, const char *arg,
914914
int unset)
915915
{

0 commit comments

Comments
 (0)