undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

commit,tag: use same wording for -F

Browse Source 
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael J Gruber 2011-02-15 14:09:04 +01:00 committed by Junio C Hamano
parent 1e58dba142
commit 726c4e3d42
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/commit.c
View File

@ -118,7 +118,7 @@ static struct option builtin_commit_options[] = {
OPT__VERBOSE(&verbose, "show diff in commit message template"), OPT__VERBOSE(&verbose, "show diff in commit message template"),
OPT_GROUP("Commit message options"), 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, "author", &force_author, "AUTHOR", "override author for commit"),
OPT_STRING(0, "date", &force_date, "DATE", "override date 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), OPT_CALLBACK('m', "message", &message, "MESSAGE", "specify commit message", opt_parse_m),

2
builtin/tag.c
View File

@ -378,7 +378,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
"annotated tag, needs a message"), "annotated tag, needs a message"),
OPT_CALLBACK('m', NULL, &msg, "msg", OPT_CALLBACK('m', NULL, &msg, "msg",
"message for the tag", parse_msg_arg), "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_BOOLEAN('s', NULL, &sign, "annotated and GPG-signed tag"),
OPT_STRING('u', NULL, &keyid, "key-id", OPT_STRING('u', NULL, &keyid, "key-id",
"use another key to sign the tag"), "use another key to sign the tag"),