rebase: deprecate --preserve-merges
We have something much better now: --rebase-merges (which is a complete re-design --preserve-merges, with a lot of issues fixed such as the inability to reorder commits with --preserve-merges). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
6053c04b88
commit
427c3bd28a
@ -1100,8 +1100,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
|
||||
PARSE_OPT_NOARG | PARSE_OPT_NONEG,
|
||||
parse_opt_interactive },
|
||||
OPT_SET_INT('p', "preserve-merges", &options.type,
|
||||
N_("try to recreate merges instead of ignoring "
|
||||
"them"), REBASE_PRESERVE_MERGES),
|
||||
N_("(DEPRECATED) try to recreate merges instead of "
|
||||
"ignoring them"), REBASE_PRESERVE_MERGES),
|
||||
OPT_BOOL(0, "rerere-autoupdate",
|
||||
&options.allow_rerere_autoupdate,
|
||||
N_("allow rerere to update index with resolved "
|
||||
@ -1212,6 +1212,10 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
|
||||
usage_with_options(builtin_rebase_usage,
|
||||
builtin_rebase_options);
|
||||
|
||||
if (options.type == REBASE_PRESERVE_MERGES)
|
||||
warning(_("git rebase --preserve-merges is deprecated. "
|
||||
"Use --rebase-merges instead."));
|
||||
|
||||
if (action != NO_ACTION && !in_progress)
|
||||
die(_("No rebase in progress?"));
|
||||
setenv(GIT_REFLOG_ACTION_ENVIRONMENT, "rebase", 0);
|
||||
|
Reference in New Issue
Block a user