kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2019-11-10 18:02:13 +09:00
parent 8f40d89783 feebd2d256
commit 0c51181ffb
1 changed files with 4 additions and 3 deletions
builtin

7
builtin/rebase.c
View File

@ -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"), 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_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate), OPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate),
OPT_BOOL('k', "keep-empty", &options.keep_empty, OPT_BOOL('k', "keep-empty", &options.keep_empty,
N_("preserve empty commits during rebase")), N_("preserve empty commits during rebase")),