From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 23 Mar 2015 18:28:02 +0000 (-0700)
Subject: Merge branch 'jk/tag-h-column-is-a-listing-option'
X-Git-Tag: v2.4.0-rc0~26
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a633651d214d855a036535f6f64b5eba58892a0f?hp=e80e85a52adfda053cafc3b23058a86aff35404f

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

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"),