Code

commit,tag: use same wording for -F
authorMichael J Gruber <git@drmicha.warpmail.net>
Tue, 15 Feb 2011 13:09:04 +0000 (14:09 +0100)
committerJunio C Hamano <gitster@pobox.com>
Tue, 15 Feb 2011 18:51:08 +0000 (10:51 -0800)
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/commit.c
builtin/tag.c

index 03cff5af631fec975442c528b1ffba264b879c8e..8a534de3cc962f2f843e4e442169f272f397a9dc 100644 (file)
@@ -118,7 +118,7 @@ static struct option builtin_commit_options[] = {
        OPT__VERBOSE(&verbose, "show diff in commit message template"),
 
        OPT_GROUP("Commit message options"),
-       OPT_FILENAME('F', "file", &logfile, "read log from file"),
+       OPT_FILENAME('F', "file", &logfile, "read message from file"),
        OPT_STRING(0, "author", &force_author, "AUTHOR", "override author for commit"),
        OPT_STRING(0, "date", &force_date, "DATE", "override date for commit"),
        OPT_CALLBACK('m', "message", &message, "MESSAGE", "specify commit message", opt_parse_m),
index aa1f87d47a3e4bdaa2ca3711c9dfc495fc2247e0..6408171f9b45c5f3d020439f9d8d45988a92cede 100644 (file)
@@ -378,7 +378,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
                                        "annotated tag, needs a message"),
                OPT_CALLBACK('m', NULL, &msg, "msg",
                             "message for the tag", parse_msg_arg),
-               OPT_FILENAME('F', NULL, &msgfile, "message in a file"),
+               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",
                                        "use another key to sign the tag"),