From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 12 Feb 2008 00:35:41 +0000 (-0800)
Subject: Merge branch 'ph/describe-match'
X-Git-Tag: v1.5.5-rc0~233
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3960a951795819e6cd09422e15092b45cdd46f73?ds=inline;hp=-c

Merge branch 'ph/describe-match'

* ph/describe-match:
git-name-rev: add a --(no-)undefined option.
git-describe: Add a --match option to limit considered tags.
---

3960a951795819e6cd09422e15092b45cdd46f73
diff --combined Documentation/git-describe.txt
index 0742152b81,9c7a032342..1c3dfb40c6
--- a/Documentation/git-describe.txt
+++ b/Documentation/git-describe.txt
@@@ -51,6 -51,10 +51,10 @@@ OPTION
  	being employed to standard error.  The tag name will still
  	be printed to standard out.
  
+ --match <pattern>::
+ 	Only consider tags matching the given pattern (can be used to avoid
+ 	leaking private tags made from the repository).
+ 
  EXAMPLES
  --------
  
@@@ -123,4 -127,4 +127,4 @@@ Documentation by David Greaves, Junio 
  
  GIT
  ---
 -Part of the gitlink:git[7] suite
 +Part of the linkgit:git[7] suite