From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 7 Sep 2021 21:05:09 +0000 (+0000)
Subject: rebase: remove obsolete code comment
X-Git-Tag: v2.34.0-rc0~53^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ff8d6e5a665cf677a2bdec6f62b47b8987dae3c1;p=thirdparty%2Fgit.git

rebase: remove obsolete code comment

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>
Reviewed-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/rebase.c b/builtin/rebase.c
index 0935e8d6e8..b8eb8e8304 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");