mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
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>
This commit is contained in:
parent
5b55b32bd2
commit
ff8d6e5a66
|
@ -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…
Reference in a new issue