Merge branch 'bc/wildcard-credential'

A configuration element used for credential subsystem can now use
wildcard pattern to specify for which set of URLs the entry
applies.

* bc/wildcard-credential:
  credential: allow wildcard patterns when matching config
  credential: use the last matching username in the config
  t0300: add tests for some additional cases
  t1300: add test for urlmatch with multiple wildcards
  mailmap: add an additional email address for brian m. carlson

diff --cc .mailmap
Simple merge

diff --cc Documentation/gitcredentials.txt
Simple merge

diff --cc credential.h
Simple merge

diff --cc strbuf.h
Simple merge

diff --cc t/t1300-config.sh
Simple merge