mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-07 20:56:09 +02:00
Code

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>
This commit is contained in:
Johannes Schindelin 2021-09-07 21:05:10 +00:00 committed by Junio C Hamano
parent ff8d6e5a66
commit 82db1f8439
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/rebase.c
View File

@ -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)
{