diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-02-27 13:57:12 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-27 13:57:12 -0800 |
| commit | a411726930a6fc97d5a1f62d8d8d59b8587b10f2 (patch) | |
| tree | 2b9b9a0a63bd6edd29feb482bc05086b6c8df68b /Documentation | |
| parent | Merge branch 'mm/merge-rename-delete-message' (diff) | |
| parent | urlmatch: allow globbing for the URL host part (diff) | |
| download | tgif-a411726930a6fc97d5a1f62d8d8d59b8587b10f2.tar.xz | |
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
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 015346c417..10351a2100 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1919,7 +1919,10 @@ http.<url>.*:: must match exactly between the config key and the URL. . Host/domain name (e.g., `example.com` in `https://example.com/`). - This field must match exactly between the config key and the URL. + This field must match between the config key and the URL. It is + possible to specify a `*` as part of the host name to match all subdomains + at this level. `https://*.example.com/` for example would match + `https://foo.example.com/`, but not `https://foo.bar.example.com/`. . Port number (e.g., `8080` in `http://example.com:8080/`). This field must match exactly between the config key and the URL. |