diff options
| author |  Stephen Boyd <bebarino@gmail.com> | 2010-03-24 00:16:04 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-03-24 19:45:31 -0700 |
| commit | 63e671508782ca2dd386e5878d3682090fd64eda (patch) | |
| tree | 03d7d61ced5bf94fcea34a14526b9c3f0fa4743a | |
| parent | fmt-merge-msg: remove custom string_list implementation (diff) | |
| download | tgif-63e671508782ca2dd386e5878d3682090fd64eda.tar.xz | |
fmt-merge-msg: hide summary option
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 <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | 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 0fb4014691..379a03131f 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() }; |