diff mbox series

[v3,08/11] rebase: remove obsolete code comment

Message ID d23f245b68442df01f698bb9f5aaabcc5bee5f9c.1631048713.git.gitgitgadget@gmail.com (mailing list archive)
State Accepted
Commit ff8d6e5a665cf677a2bdec6f62b47b8987dae3c1
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>

Now that we no longer have a `--preserve-merges` backend, this comment
needs to be adjusted.

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 0935e8d6e83..b8eb8e8304b 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1415,7 +1415,7 @@  int cmd_rebase(int argc, const char **argv, const char *prefix)
 		if (options.ignore_date)
 			strvec_push(&options.git_am_opts, "--ignore-date");
 	} else {
-		/* REBASE_MERGE and PRESERVE_MERGES */
+		/* REBASE_MERGE */
 		if (ignore_whitespace) {
 			string_list_append(&strategy_options,
 					   "ignore-space-change");