diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-03-27 13:00:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-27 13:00:23 -0700 |
| commit | d8279c7d85f82edea8c86e4e7c2fbd787ae09735 (patch) | |
| tree | 0e565c086f40ea948b4fd931d0c5369dd32c56cb | |
| parent | a730ea3c3aa8d09cd69d114ea4160049d9a4fd04 (diff) | |
| parent | dd059c6c07ede0486da5f9d02619687ae3108773 (diff) | |
| download | git-d8279c7d85f82edea8c86e4e7c2fbd787ae09735.tar.gz | |
Merge branch 'jk/tag-h-column-is-a-listing-option' into maint
"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
| -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 e633f4efdb..d315827cf5 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"), |