rebase: hide --preserve-merges option
Since --preserve-merges has been deprecated in favour of --rebase-merges, mark this option as hidden so it no longer shows up in the usage and completions. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Denton Liu committed
Oct 18, 2019 at 16:55 UTC
feebd2d256adffa6a1e31832266ee9466a63c0c2
1 file changed
+4
-3
builtin/rebase.c
+4
-3
@@ -1099,9 +1099,10 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
1099
N_("let the user edit the list of commits to rebase"),
1100
PARSE_OPT_NOARG | PARSE_OPT_NONEG,
1101
parse_opt_interactive },
1102
- OPT_SET_INT('p', "preserve-merges", &options.type,
1103
- N_("(DEPRECATED) try to recreate merges instead of "
1104
- "ignoring them"), REBASE_PRESERVE_MERGES),
1102
+ OPT_SET_INT_F('p', "preserve-merges", &options.type,
1103
+ N_("(DEPRECATED) try to recreate merges instead of "
1104
+ "ignoring them"),
1105
+ REBASE_PRESERVE_MERGES, PARSE_OPT_HIDDEN),
1106
OPT_BOOL(0, "rerere-autoupdate",
1107
&options.allow_rerere_autoupdate,
1108
N_("allow rerere to update index with resolved "