kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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 2021-09-07 21:05:09 +00:00 committed by Junio C Hamano
parent 5b55b32bd2
commit ff8d6e5a66
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/rebase.c
View File

@ -1415,7 +1415,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
if (options.ignore_date) if (options.ignore_date)
strvec_push(&options.git_am_opts, "--ignore-date"); strvec_push(&options.git_am_opts, "--ignore-date");
} else { } else {
/* REBASE_MERGE and PRESERVE_MERGES */ /* REBASE_MERGE */
if (ignore_whitespace) { if (ignore_whitespace) {
string_list_append(&strategy_options, string_list_append(&strategy_options,
"ignore-space-change"); "ignore-space-change");