X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fgit.git;a=blobdiff_plain;f=builtin%2Frebase.c;h=e755087b0f1ebe11472ab4e4ef7165a4714e4e2f;hp=4a20582e724b00a565ee8b0fd05137a11b27568c;hb=57b530125e022de79f5f0b208bc0a5ee67c18b77;hpb=1d8b0dfa8af29213969402a4d9ce78e4d95c7718

diff --git a/builtin/rebase.c b/builtin/rebase.c
index 4a20582e72..e755087b0f 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -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"),
 			PARSE_OPT_NOARG | PARSE_OPT_NONEG,
 			parse_opt_interactive },
-		OPT_SET_INT('p', "preserve-merges", &options.type,
-			    N_("(DEPRECATED) try to recreate merges instead of "
-			       "ignoring them"), REBASE_PRESERVE_MERGES),
+		OPT_SET_INT_F('p', "preserve-merges", &options.type,
+			      N_("(DEPRECATED) try to recreate merges instead of "
+				 "ignoring them"),
+			      REBASE_PRESERVE_MERGES, PARSE_OPT_HIDDEN),
 		OPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate),
 		OPT_BOOL('k', "keep-empty", &options.keep_empty,
 			 N_("preserve empty commits during rebase")),