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

Merge branch 'jk/tag-h-column-is-a-listing-option'

Browse Source 
"git tag -h" used to show the "--column" and "--sort" options
that are about listing in a wrong section.

* jk/tag-h-column-is-a-listing-option:
  tag: fix some mis-organized options in "-h" listing
This commit is contained in:
Junio C Hamano 2015-03-23 11:28:02 -07:00
commit a633651d21
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/tag.c
View File

@ -605,13 +605,13 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
OPT_STRING('u', "local-user", &keyid, N_("key-id"), OPT_STRING('u', "local-user", &keyid, N_("key-id"),
N_("use another key to sign the tag")), N_("use another key to sign the tag")),
OPT__FORCE(&force, N_("replace the tag if exists")), OPT__FORCE(&force, N_("replace the tag if exists")),
OPT_GROUP(N_("Tag listing options")),
OPT_COLUMN(0, "column", &colopts, N_("show tag list in columns")), OPT_COLUMN(0, "column", &colopts, N_("show tag list in columns")),
{ {
OPTION_CALLBACK, 0, "sort", &tag_sort, N_("type"), N_("sort tags"), OPTION_CALLBACK, 0, "sort", &tag_sort, N_("type"), N_("sort tags"),
PARSE_OPT_NONEG, parse_opt_sort PARSE_OPT_NONEG, parse_opt_sort
}, },
OPT_GROUP(N_("Tag listing options")),
{ {
OPTION_CALLBACK, 0, "contains", &with_commit, N_("commit"), OPTION_CALLBACK, 0, "contains", &with_commit, N_("commit"),
N_("print only tags that contain the commit"), N_("print only tags that contain the commit"),