diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-05 19:36:23 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-05 19:36:23 (GMT) |
| commit | 1077bf1ff676cd172a09b88204422228f21d7cbf (patch) | |
| tree | 09198a4933da76f03c78ab6c088999a1e2fe0ce1 /builtin/tag.c | |
| parent | 3c18ee72cc2f3d0024b7314cdb1af5d41aea136a (diff) | |
| parent | 376eb14a05f693378047eee36a10035c122f0261 (diff) | |
| download | git-1077bf1ff676cd172a09b88204422228f21d7cbf.zip git-1077bf1ff676cd172a09b88204422228f21d7cbf.tar.gz git-1077bf1ff676cd172a09b88204422228f21d7cbf.tar.bz2 | |
Merge branch 'mg/branch-list'
* mg/branch-list:
t3200: clean up checks for file existence
branch: -v does not automatically imply --list
branch: allow pattern arguments
branch: introduce --list option
git-branch: introduce missing long forms for the options
git-tag: introduce long forms for the options
t6040: test branch -vv
Conflicts:
Documentation/git-tag.txt
t/t3200-branch.sh
Diffstat (limited to 'builtin/tag.c')
| -rw-r--r-- | builtin/tag.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/builtin/tag.c b/builtin/tag.c index 667515e..9d89616 100644 --- a/builtin/tag.c +++ b/builtin/tag.c @@ -429,21 +429,21 @@ int cmd_tag(int argc, const char **argv, const char *prefix) struct msg_arg msg = { 0, STRBUF_INIT }; struct commit_list *with_commit = NULL; struct option options[] = { - OPT_BOOLEAN('l', NULL, &list, "list tag names"), + OPT_BOOLEAN('l', "list", &list, "list tag names"), { OPTION_INTEGER, 'n', NULL, &lines, "n", "print <n> lines of each tag message", PARSE_OPT_OPTARG, NULL, 1 }, - OPT_BOOLEAN('d', NULL, &delete, "delete tags"), - OPT_BOOLEAN('v', NULL, &verify, "verify tags"), + OPT_BOOLEAN('d', "delete", &delete, "delete tags"), + OPT_BOOLEAN('v', "verify", &verify, "verify tags"), OPT_GROUP("Tag creation options"), - OPT_BOOLEAN('a', NULL, &annotate, + OPT_BOOLEAN('a', "annotate", &annotate, "annotated tag, needs a message"), - OPT_CALLBACK('m', NULL, &msg, "message", + OPT_CALLBACK('m', "message", &msg, "message", "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", + OPT_FILENAME('F', "file", &msgfile, "read message from file"), + OPT_BOOLEAN('s', "sign", &sign, "annotated and GPG-signed tag"), + OPT_STRING('u', "local-user", &keyid, "key-id", "use another key to sign the tag"), OPT__FORCE(&force, "replace the tag if exists"), |