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 0935e8d6e83d73c792f1b67bd105dae697fdc68b..b8eb8e8304b0a34e5cafc6a2a69f8cf9cfc135a4 100644 (file)
--- 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");