From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Feb 2017 21:57:12 +0000 (-0800)
Subject: Merge branch 'ps/urlmatch-wildcard'
X-Git-Tag: v2.13.0-rc0~175
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a411726930a6fc97d5a1f62d8d8d59b8587b10f2;p=thirdparty%2Fgit.git

Merge branch 'ps/urlmatch-wildcard'

The <url> part in "http.<url>.<variable>" configuration variable
can now be spelled with '*' that serves as wildcard.
E.g. "http.https://*.example.com.proxy" can be used to specify the
proxy used for https://a.example.com, https://b.example.com, etc.,
i.e. any host in the example.com domain.

* ps/urlmatch-wildcard:
  urlmatch: allow globbing for the URL host part
  urlmatch: include host in urlmatch ranking
  urlmatch: split host and port fields in `struct url_info`
  urlmatch: enable normalization of URLs with globs
  mailmap: add Patrick Steinhardt's work address
---

a411726930a6fc97d5a1f62d8d8d59b8587b10f2