From: Stephen Boyd Date: Wed, 24 Mar 2010 07:16:04 GMT Subject: [PATCH 7/7] fmt-merge-msg: hide summary option Message-ID: <1269414964-9518-8-git-send-email-bebarino@gmail.com> In-Reply-To: <1269414964-9518-1-git-send-email-bebarino@gmail.com> The --summary command line option has been deprecated in favor of --log. Hide the option from the help message to further discourage the use of this option. Signed-off-by: Stephen Boyd --- When is this option going to be removed? It's approaching 2 years since the deprecation occured in 6cd9cfe (fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variable, 2008-04-06) builtin/fmt-merge-msg.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c index 0fb4014..379a031 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() }; -- 1.7.0.3.254.g4503b