[PATCH v2 1/4] rebase.c: state preserve-merges has been removed

From

Philip Oakley via GitGitGadget <gitgitgadget@gmail.com>

Date

Jun 4, 2022, 11:17 UTC

Message-ID

<d60ec67cb0673a9a9ed16c62f69e0a5235966ae2.1654341469.git.gitgitgadget@gmail.com>

In-Reply-To

<pull.1242.v2.git.1654341469.gitgitgadget@gmail.com>

From: Philip Oakley <philipoakley@iee.email>

Fix and reflow the option tip.

Signed-off-by: Philip Oakley <philipoakley@iee.email>
---
 builtin/rebase.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/builtin/rebase.c b/builtin/rebase.c
index 7ab50cda2ad..bad95d98adf 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}",

-- 
gitgitgadget