rebase.c: state preserve-merges has been removed
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>
Philip Oakley committed
Jun 4, 2022 at 11:17 UTC
2f7b9f9e55ca2d8fa23fe44678a0180f7e118c86
1 file changed
+2
-2
builtin/rebase.c
+2
-2
@@ -1110,8 +1110,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
1110
PARSE_OPT_NOARG | PARSE_OPT_NONEG,
1111
parse_opt_interactive),
1112
OPT_SET_INT_F('p', "preserve-merges", &preserve_merges_selected,
1113
- N_("(DEPRECATED) try to recreate merges instead of "
1114
- "ignoring them"),
1113
+ N_("(REMOVED) was: try to recreate merges "
1114
+ "instead of ignoring them"),
1115
1, PARSE_OPT_HIDDEN),
1116
OPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate),
1117
OPT_CALLBACK_F(0, "empty", &options, "{drop,keep,ask}",