diff mbox series

[v3,09/11] rebase: stop mentioning the -p option in comments

Message ID 6905c8746ba2049e9ddfa8ceff5c714559ebdb86.1631048713.git.gitgitgadget@gmail.com (mailing list archive)
State Accepted
Commit 82db1f8439bbde725a4dddb43f4e7c1cbe532a13
Headers show
Series Drop support for git rebase --preserve-merges | expand

Commit Message

Johannes Schindelin Sept. 7, 2021, 9:05 p.m. UTC 
From: Johannes Schindelin <johannes.schindelin@gmx.de>

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>
---
 builtin/rebase.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/builtin/rebase.c b/builtin/rebase.c
index b8eb8e8304b..c4d4cf25028 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)
 {