Skip to content

Commit ff8d6e5

Browse files
dschogitster
authored andcommitted
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 <[email protected]> Reviewed-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 5b55b32 commit ff8d6e5

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

builtin/rebase.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1415,7 +1415,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
14151415
if (options.ignore_date)
14161416
strvec_push(&options.git_am_opts, "--ignore-date");
14171417
} else {
1418-
/* REBASE_MERGE and PRESERVE_MERGES */
1418+
/* REBASE_MERGE */
14191419
if (ignore_whitespace) {
14201420
string_list_append(&strategy_options,
14211421
"ignore-space-change");

0 commit comments

Comments
 (0)