[PATCH 4/7] merge,tag: describe -m just like commit
- From
Michael J Gruber <git@drmicha.warpmail.net>
- Date
- Feb 14, 2011, 15:10 UTC
- Message-ID
- <5d55b72b16f3d2def5fa955862fe5be6ff9f82f7.1297695910.git.git@drmicha.warpmail.net>
- In-Reply-To
- <cover.1297695910.git.git@drmicha.warpmail.net>
This also removes the misleading "if any" which sounds as if omitting "-m" would omit the commmit message. (It meant to mean "if a merge commit is created at all".)
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> --- builtin/merge.c | 4 ++-- builtin/tag.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c index 9403747..cbbd053 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -194,8 +194,8 @@ static struct option builtin_merge_options[] = { "merge strategy to use", option_parse_strategy), OPT_CALLBACK('X', "strategy-option", &xopts, "option=value", "option for selected merge strategy", option_parse_x), - OPT_CALLBACK('m', "message", &merge_msg, "message", - "message to be used for the merge commit (if any)", + OPT_CALLBACK('m', "message", &merge_msg, "MESSAGE", + "specify merge commit message", option_parse_message), OPT__VERBOSITY(&verbosity), OPT_BOOLEAN(0, "abort", &abort_current_merge, diff --git a/builtin/tag.c b/builtin/tag.c index 6408171..e135717 100644 --- a/builtin/tag.c +++ b/builtin/tag.c @@ -376,8 +376,8 @@ int cmd_tag(int argc, const char **argv, const char *prefix) OPT_GROUP("Tag creation options"), OPT_BOOLEAN('a', NULL, &annotate, "annotated tag, needs a message"), - OPT_CALLBACK('m', NULL, &msg, "msg", - "message for the tag", parse_msg_arg), + OPT_CALLBACK('m', NULL, &msg, "MESSAGE", + "specify tag message", parse_msg_arg), OPT_FILENAME('F', NULL, &msgfile, "read message from file"), OPT_BOOLEAN('s', NULL, &sign, "annotated and GPG-signed tag"), OPT_STRING('u', NULL, &keyid, "key-id",
-- 1.7.4.1.74.gf39475