summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2015-03-12 18:15:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-03-12 18:54:55 (GMT)
commitdd059c6c07ede0486da5f9d02619687ae3108773 (patch)
tree7432ab301d8893871387178285bf1d7a59fbd7a8
parentb150794dafb0a7a1c5caba6fdf7d517a1a15cb59 (diff)
downloadgit-dd059c6c07ede0486da5f9d02619687ae3108773.zip
git-dd059c6c07ede0486da5f9d02619687ae3108773.tar.gz
git-dd059c6c07ede0486da5f9d02619687ae3108773.tar.bz2
tag: fix some mis-organized options in "-h" listing
Running "git tag -h" currently prints: [...] Tag creation options [...] --column[=<style>] show tag list in columns --sort <type> sort tags Tag listing options --contains <commit> print only tags that contain the commit --points-at <object> print only tags of the object The "--column" and "--sort" options should go under the "Tag listing" group. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin/tag.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/tag.c b/builtin/tag.c
index e063035..de1beed 100644
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -604,13 +604,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"),