diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-11-10 09:02:13 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-11-10 09:02:13 (GMT) |
| commit | 0c51181ffb178a6581ecb471091cbd2d0c48f165 (patch) | |
| tree | 475fe1611bbc83b20280597491f20f2ab3ac50ba | |
| parent | 8f40d897834c9c60ebab3d34607a5b8a7f33163d (diff) | |
| parent | feebd2d256adffa6a1e31832266ee9466a63c0c2 (diff) | |
| download | git-0c51181ffb178a6581ecb471091cbd2d0c48f165.zip git-0c51181ffb178a6581ecb471091cbd2d0c48f165.tar.gz git-0c51181ffb178a6581ecb471091cbd2d0c48f165.tar.bz2 | |
Merge branch 'js/rebase-deprecate-preserve-merges'
"git rebase --preserve-merges" has been marked as deprecated; this
release stops advertising it in the "git rebase -h" output.
* js/rebase-deprecate-preserve-merges:
rebase: hide --preserve-merges option
| -rw-r--r-- | builtin/rebase.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index 4a20582..e755087 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1471,9 +1471,10 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) N_("let the user edit the list of commits to rebase"), PARSE_OPT_NOARG | PARSE_OPT_NONEG, parse_opt_interactive }, - OPT_SET_INT('p', "preserve-merges", &options.type, - N_("(DEPRECATED) try to recreate merges instead of " - "ignoring them"), REBASE_PRESERVE_MERGES), + OPT_SET_INT_F('p', "preserve-merges", &options.type, + N_("(DEPRECATED) try to recreate merges instead of " + "ignoring them"), + REBASE_PRESERVE_MERGES, PARSE_OPT_HIDDEN), OPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate), OPT_BOOL('k', "keep-empty", &options.keep_empty, N_("preserve empty commits during rebase")), |