diff options
| author |  Michael J Gruber <git@drmicha.warpmail.net> | 2011-02-15 14:09:07 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-02-15 10:51:08 -0800 |
| commit | 3f40617566a2f683835de9efab54df0f14b19b70 (patch) | |
| tree | 4a349535ac07aaaef58dc149a3e5ce1b2e199d28 /builtin/merge.c | |
| parent | clone,init: describe --template using the same wording (diff) | |
| download | tgif-3f40617566a2f683835de9efab54df0f14b19b70.tar.xz | |
commit,merge,tag: describe -m likewise
This also removes the superfluous "specify" and rewords the misleading
"if any" which sounds as if omitting "-m" would omit the merge commit
message. (It means "if a merge commit is created at all".)
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 42fff387e6..a682043fe5 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", + "merge commit message (for a non-fast-forward merge)", option_parse_message), OPT__VERBOSITY(&verbosity), OPT_BOOLEAN(0, "abort", &abort_current_merge, |