diff options
| author | Philip Oakley <philipoakley@iee.email> | 2022-06-04 11:17:46 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-06-06 10:45:54 -0700 |
| commit | 2f7b9f9e55ca2d8fa23fe44678a0180f7e118c86 (patch) | |
| tree | d2eca0b6cbc864d7df9eb4bdb68fd152fb394a5c | |
| parent | Git 2.36.1 (diff) | |
| download | git-2f7b9f9e55ca2d8fa23fe44678a0180f7e118c86.tar.gz git-2f7b9f9e55ca2d8fa23fe44678a0180f7e118c86.zip | |
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>
| -rw-r--r-- | builtin/rebase.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index 27fde7bf28..7c1b9bd9b9 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1110,8 +1110,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) PARSE_OPT_NOARG | PARSE_OPT_NONEG, parse_opt_interactive), OPT_SET_INT_F('p', "preserve-merges", &preserve_merges_selected, - N_("(DEPRECATED) try to recreate merges instead of " - "ignoring them"), + N_("(REMOVED) was: try to recreate merges " + "instead of ignoring them"), 1, PARSE_OPT_HIDDEN), OPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate), OPT_CALLBACK_F(0, "empty", &options, "{drop,keep,ask}", |