From: Jeff King <peff@peff.net>
Date: Thu, 12 Mar 2015 18:15:09 +0000 (-0400)
Subject: tag: fix some mis-organized options in "-h" listing
X-Git-Tag: v2.3.5~17^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/dd059c6c07ede0486da5f9d02619687ae3108773?ds=inline;hp=--cc

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>
---

dd059c6c07ede0486da5f9d02619687ae3108773
diff --git a/builtin/tag.c b/builtin/tag.c
index e063035515..de1beed2f9 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"),