Merge branch 'jk/describe-contains-all-match-fix' into jch

The 'git describe --contains --all' command has been fixed to
properly honor the '--match' and '--exclude' options by passing
them down to 'git name-rev' with the appropriate reference
prefixes.

* jk/describe-contains-all-match-fix:
  describe: fix --exclude, --match with --contains and --all

diff --cc builtin/describe.c
Simple merge

diff --cc t/t6120-describe.sh
Simple merge