diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2021-09-07 21:05:09 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-09-07 21:45:33 -0700 |
| commit | ff8d6e5a665cf677a2bdec6f62b47b8987dae3c1 (patch) | |
| tree | b0e9d76da754556828fb089a00a435139344e948 /builtin | |
| parent | rebase: drop the internal `rebase--interactive` command (diff) | |
| download | tgif-ff8d6e5a665cf677a2bdec6f62b47b8987dae3c1.tar.xz | |
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>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/rebase.c | 2 |
1 files changed, 1 insertions, 1 deletions
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"); |