diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-03-23 11:28:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-23 11:28:02 -0700 |
| commit | a633651d214d855a036535f6f64b5eba58892a0f (patch) | |
| tree | 7c07a39d7a99f5a90c9a08ee212e1fc5947e621d /builtin | |
| parent | e80e85a52adfda053cafc3b23058a86aff35404f (diff) | |
| parent | dd059c6c07ede0486da5f9d02619687ae3108773 (diff) | |
| download | git-a633651d214d855a036535f6f64b5eba58892a0f.tar.gz | |
Merge branch 'jk/tag-h-column-is-a-listing-option'
"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
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/tag.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/tag.c b/builtin/tag.c index 4194b9a711..6f07ac6b93 100644 --- a/builtin/tag.c +++ b/builtin/tag.c @@ -605,13 +605,13 @@ int cmd_tag(int argc, const char **argv, const char *prefix) OPT_STRING('u', "local-user", &keyid, N_("key-id"), N_("use another key to sign the tag")), 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")), { OPTION_CALLBACK, 0, "sort", &tag_sort, N_("type"), N_("sort tags"), PARSE_OPT_NONEG, parse_opt_sort }, - - OPT_GROUP(N_("Tag listing options")), { OPTION_CALLBACK, 0, "contains", &with_commit, N_("commit"), N_("print only tags that contain the commit"), |