From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 19 Aug 2015 21:41:32 +0000 (-0700)
Subject: Merge branch 'kn/tag-doc-fix' into maint
X-Git-Tag: v2.5.1~10
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/24493ff5d897d79b2710b98ba1ca714fc91cd557?hp=-c

Merge branch 'kn/tag-doc-fix' into maint

* kn/tag-doc-fix:
Documentation/tag: remove double occurance of "<pattern>"
---

24493ff5d897d79b2710b98ba1ca714fc91cd557
diff --combined Documentation/git-tag.txt
index 034d10d633,a994b3b198..4b04c2b7d5
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@@ -14,7 -14,6 +14,6 @@@ SYNOPSI
  'git tag' -d <tagname>...
  'git tag' [-n[<num>]] -l [--contains <commit>] [--points-at <object>]
  	[--column[=<options>] | --no-column] [<pattern>...]
- 	[<pattern>...]
  'git tag' -v <tagname>...
  
  DESCRIPTION
@@@ -98,13 -97,10 +97,13 @@@ OPTION
  --sort=<type>::
  	Sort in a specific order. Supported type is "refname"
  	(lexicographic order), "version:refname" or "v:refname" (tag
 -	names are treated as versions). Prepend "-" to reverse sort
 -	order. When this option is not given, the sort order defaults to the
 -	value configured for the 'tag.sort' variable if it exists, or
 -	lexicographic order otherwise. See linkgit:git-config[1].
 +	names are treated as versions). The "version:refname" sort
 +	order can also be affected by the
 +	"versionsort.prereleaseSuffix" configuration variable. Prepend
 +	"-" to reverse sort order. When this option is not given, the
 +	sort order defaults to the value configured for the 'tag.sort'
 +	variable if it exists, or lexicographic order otherwise. See
 +	linkgit:git-config[1].
  
  --column[=<options>]::
  --no-column::
@@@ -158,13 -154,13 +157,13 @@@ This option is only applicable when lis
  CONFIGURATION
  -------------
  By default, 'git tag' in sign-with-default mode (-s) will use your
 -committer identity (of the form "Your Name <\your@email.address>") to
 +committer identity (of the form `Your Name <your@email.address>`) to
  find a key.  If you want to use a different default key, you can specify
  it in the repository configuration as follows:
  
  -------------------------------------
  [user]
 -    signingkey = <gpg-key-id>
 +    signingKey = <gpg-key-id>
  -------------------------------------