mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase.c: state preserve-merges has been removed

Browse Source 
Since feebd2d256 (rebase: hide --preserve-merges option, 2019-10-18)
this option is now removed as stated in the subsequent release notes.

Fix and reflow the option tip.

Signed-off-by: Philip Oakley <philipoakley@iee.email>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Philip Oakley
2022-06-04 11:17:46 +00:00
committed by Junio C Hamano
parent e54793a95a
commit 2f7b9f9e55
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/rebase.c
View File

@ -1110,8 +1110,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
PARSE_OPT_NOARG | PARSE_OPT_NONEG, PARSE_OPT_NOARG | PARSE_OPT_NONEG,
parse_opt_interactive), parse_opt_interactive),
OPT_SET_INT_F('p', "preserve-merges", &preserve_merges_selected, OPT_SET_INT_F('p', "preserve-merges", &preserve_merges_selected,
N_("(DEPRECATED) try to recreate merges instead of " N_("(REMOVED) was: try to recreate merges "
"ignoring them"), "instead of ignoring them"),
1, PARSE_OPT_HIDDEN), 1, PARSE_OPT_HIDDEN),
OPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate), OPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate),
OPT_CALLBACK_F(0, "empty", &options, "{drop,keep,ask}", OPT_CALLBACK_F(0, "empty", &options, "{drop,keep,ask}",