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.

diff --combined Documentation/git-describe.txt
index 0742152b811e23ea304feb368c8d949785e2fdfb,9c7a0323429af93520026374620f5620d79e8cb6..1c3dfb40c63350651efb570ed540b69c34ccbc81
--- 1/Documentation/git-describe.txt
--- 2/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