diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-09-10 01:50:32 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-10 01:50:36 +0400 |
| commit | a0a08d48d068551ea819847743d8f5a178b9f8ba (patch) | |
| tree | b8c05ed186dfe1da37b515301f9775f18511704e /ll-merge.c | |
| parent | b02f5aeda6f66ac3be9b2e35f9b237d4f1f80d73 (diff) | |
| parent | 6667a6ac20747eb56eb2c03c39aceaf6aebbae3c (diff) | |
Merge branch 'jc/url-match'
Allow section.<urlpattern>.var configuration variables to be
treated as a "virtual" section.var given a URL, and use the
mechanism to enhance http.* configuration variables.
This is a reroll of Kyle J. McKay's work.
* jc/url-match:
builtin/config.c: compilation fix
config: "git config --get-urlmatch" parses section.<url>.key
builtin/config: refactor collect_config()
config: parse http.<url>.<variable> using urlmatch
config: add generic callback wrapper to parse section.<url>.key
config: add helper to normalize and match URLs
http.c: fix parsing of http.sslCertPasswordProtected variable
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions