undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase: hide --preserve-merges option

Browse Source 
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>
This commit is contained in:
Denton Liu 2019-10-18 16:55:56 -07:00 committed by Junio C Hamano
parent 7948b49ac7
commit feebd2d256
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
builtin/rebase.c
View File

@ -1099,9 +1099,10 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
N_("let the user edit the list of commits to rebase"), N_("let the user edit the list of commits to rebase"),
PARSE_OPT_NOARG | PARSE_OPT_NONEG, PARSE_OPT_NOARG | PARSE_OPT_NONEG,
parse_opt_interactive }, parse_opt_interactive },
OPT_SET_INT('p', "preserve-merges", &options.type, OPT_SET_INT_F('p', "preserve-merges", &options.type,
N_("(DEPRECATED) try to recreate merges instead of " N_("(DEPRECATED) try to recreate merges instead of "
"ignoring them"), REBASE_PRESERVE_MERGES), "ignoring them"),
REBASE_PRESERVE_MERGES, PARSE_OPT_HIDDEN),
OPT_BOOL(0, "rerere-autoupdate", OPT_BOOL(0, "rerere-autoupdate",
&options.allow_rerere_autoupdate, &options.allow_rerere_autoupdate,
N_("allow rerere to update index with resolved " N_("allow rerere to update index with resolved "