X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin%2Ffmt-merge-msg.c;h=379a03131fbd84fb2b45a6b05e62daf82b7e4947;hb=34c071aea4aed9db484eca21c12dd443888f43ec;hp=0fb4014691f656eece34f03525bee6b0546022bb;hpb=fcb243f7dbfa30311c017346a7677c93ea5b1321;p=git.git

diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index 0fb401469..379a03131 100644
--- a/builtin/fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
@@ -301,7 +301,9 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
 	const char *inpath = NULL;
 	struct option options[] = {
 		OPT_BOOLEAN(0, "log",     &merge_summary, "populate log with the shortlog"),
-		OPT_BOOLEAN(0, "summary", &merge_summary, "alias for --log"),
+		{ OPTION_BOOLEAN, 0, "summary", &merge_summary, NULL,
+		  "alias for --log (deprecated)",
+		  PARSE_OPT_NOARG | PARSE_OPT_HIDDEN },
 		OPT_FILENAME('F', "file", &inpath, "file to read from"),
 		OPT_END()
 	};