From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 19 Mar 2013 19:16:31 +0000 (-0700)
Subject: Merge branch 'gp/describe-match-uses-glob-pattern'
X-Git-Tag: v1.8.3-rc0~220
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3ae5d5016e71a206be1f79fe873a2016ed56d7d1?ds=inline;hp=-c

Merge branch 'gp/describe-match-uses-glob-pattern'

The syntax of the pattern given to the "--match=<pattern>" argument
to "git describe" was not documented to be a glob.

* gp/describe-match-uses-glob-pattern:
describe: Document --match pattern format
---

3ae5d5016e71a206be1f79fe873a2016ed56d7d1
diff --combined Documentation/git-describe.txt
index 32da244fd5,711040d2f1..3c81e85ec5
--- a/Documentation/git-describe.txt
+++ b/Documentation/git-describe.txt
@@@ -81,8 -81,9 +81,9 @@@ OPTION
  	that points at object deadbee....).
  
  --match <pattern>::
- 	Only consider tags matching the given pattern (can be used to avoid
- 	leaking private tags made from the repository).
+ 	Only consider tags matching the given `glob(7)` pattern,
+ 	excluding the "refs/tags/" prefix.  This can be used to avoid
+ 	leaking private tags from the repository.
  
  --always::
  	Show uniquely abbreviated commit object as fallback.
@@@ -131,7 -132,7 +132,7 @@@ closest tagname without any suffix
  
  Note that the suffix you get if you type these commands today may be
  longer than what Linus saw above when he ran these commands, as your
 -git repository may have new commits whose object names begin with
 +Git repository may have new commits whose object names begin with
  975b that did not exist back then, and "-g975b" suffix alone may not
  be sufficient to disambiguate these commits.