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>
Johannes Schindelin committed
Sep 7, 2021 at 21:05 UTC
ff8d6e5a665cf677a2bdec6f62b47b8987dae3c1
1 file changed
+1
-1
builtin/rebase.c
+1
-1
@@ -1415,7 +1415,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
1415
if (options.ignore_date)
1416
strvec_push(&options.git_am_opts, "--ignore-date");
1417
} else {
1418
- /* REBASE_MERGE and PRESERVE_MERGES */
1418
+ /* REBASE_MERGE */
1419
if (ignore_whitespace) {
1420
string_list_append(&strategy_options,
1421
"ignore-space-change");