Browse Source

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>
maint
Johannes Schindelin 4 years ago committed by Junio C Hamano
parent
commit
ff8d6e5a66
  1. 2
      builtin/rebase.c

2
builtin/rebase.c

@ -1415,7 +1415,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) @@ -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");

Loading…
Cancel
Save