diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2021-09-07 21:05:10 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-07 21:45:33 -0700 |
| commit | 82db1f8439bbde725a4dddb43f4e7c1cbe532a13 (patch) | |
| tree | 3575174f1a2b38cec815f5127adb8152b12721a2 | |
| parent | ff8d6e5a665cf677a2bdec6f62b47b8987dae3c1 (diff) | |
| download | git-82db1f8439bbde725a4dddb43f4e7c1cbe532a13.tar.gz | |
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>
| -rw-r--r-- | builtin/rebase.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) { |