From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 10 Nov 2019 09:02:13 +0000 (+0900)
Subject: Merge branch 'js/rebase-deprecate-preserve-merges'
X-Git-Tag: v2.25.0-rc0~145
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0c51181ffb178a6581ecb471091cbd2d0c48f165;p=thirdparty%2Fgit.git

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
---

0c51181ffb178a6581ecb471091cbd2d0c48f165
diff --cc builtin/rebase.c
index 4a20582e72,0d63651d95..e755087b0f
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@@ -1471,10 -1099,14 +1471,11 @@@ int cmd_rebase(int argc, const char **a
  			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_BOOL(0, "rerere-autoupdate",
 -			 &options.allow_rerere_autoupdate,
 -			 N_("allow rerere to update index with resolved "
 -			    "conflict")),
 +		OPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate),
  		OPT_BOOL('k', "keep-empty", &options.keep_empty,
  			 N_("preserve empty commits during rebase")),
  		OPT_BOOL(0, "autosquash", &options.autosquash,