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>
Michael J Gruber committed
Feb 15, 2011 at 14:09 UTC
3f40617566a2f683835de9efab54df0f14b19b70
3 files changed
+5
-5
builtin/commit.c
+1
-1
@@ -121,7 +121,7 @@ static struct option builtin_commit_options[] = {
121
OPT_FILENAME('F', "file", &logfile, "read message from file"),
122
OPT_STRING(0, "author", &force_author, "AUTHOR", "override author for commit"),
123
OPT_STRING(0, "date", &force_date, "DATE", "override date for commit"),
124
- OPT_CALLBACK('m', "message", &message, "MESSAGE", "specify commit message", opt_parse_m),
124
+ OPT_CALLBACK('m', "message", &message, "MESSAGE", "commit message", opt_parse_m),
125
OPT_STRING('c', "reedit-message", &edit_message, "COMMIT", "reuse and edit message from specified commit"),
126
OPT_STRING('C', "reuse-message", &use_message, "COMMIT", "reuse message from specified commit"),
127
OPT_STRING(0, "fixup", &fixup_message, "COMMIT", "use autosquash formatted message to fixup specified commit"),
builtin/merge.c
+2
-2
@@ -194,8 +194,8 @@ static struct option builtin_merge_options[] = {
194
"merge strategy to use", option_parse_strategy),
195
OPT_CALLBACK('X', "strategy-option", &xopts, "option=value",
196
"option for selected merge strategy", option_parse_x),
197
- OPT_CALLBACK('m', "message", &merge_msg, "message",
198
- "message to be used for the merge commit (if any)",
197
+ OPT_CALLBACK('m', "message", &merge_msg, "MESSAGE",
198
+ "merge commit message (for a non-fast-forward merge)",
199
option_parse_message),
200
OPT__VERBOSITY(&verbosity),
201
OPT_BOOLEAN(0, "abort", &abort_current_merge,
builtin/tag.c
+2
-2
@@ -376,8 +376,8 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
376
OPT_GROUP("Tag creation options"),
377
OPT_BOOLEAN('a', NULL, &annotate,
378
"annotated tag, needs a message"),
379
- OPT_CALLBACK('m', NULL, &msg, "msg",
380
- "message for the tag", parse_msg_arg),
379
+ OPT_CALLBACK('m', NULL, &msg, "MESSAGE",
380
+ "tag message", parse_msg_arg),
381
OPT_FILENAME('F', NULL, &msgfile, "read message from file"),
382
OPT_BOOLEAN('s', NULL, &sign, "annotated and GPG-signed tag"),
383
OPT_STRING('u', NULL, &keyid, "key-id",