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 --cc Documentation/git-describe.txt
Simple merge