diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-04-10 02:14:24 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-10 02:14:24 +0900 |
| commit | fa1b86e45743fd5895c33adcd3769782e608bb40 (patch) | |
| tree | 75ae7fdfcddad4fd8039ca66b498cc8128bedc4c /builtin | |
| parent | Merge branch 'ms/worktree-add-atomic-mkdir' (diff) | |
| parent | rebase: deprecate --preserve-merges (diff) | |
| download | tgif-fa1b86e45743fd5895c33adcd3769782e608bb40.tar.xz | |
Merge branch 'js/rebase-deprecate-preserve-merges'
"git rebase --rebase-merges" replaces its old "--preserve-merges"
option; the latter is now marked as deprecated.
* js/rebase-deprecate-preserve-merges:
rebase: deprecate --preserve-merges
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/rebase.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index 77deebc65c..551b72f52d 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1105,8 +1105,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 " @@ -1217,6 +1217,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); |