aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-09-09 14:50:32 -0700
committerJunio C Hamano <gitster@pobox.com>2013-09-09 14:50:36 -0700
commita0a08d48d068551ea819847743d8f5a178b9f8ba (patch)
treeb8c05ed186dfe1da37b515301f9775f18511704e /.gitignore
parentb02f5aeda6f66ac3be9b2e35f9b237d4f1f80d73 (diff)
parent6667a6ac20747eb56eb2c03c39aceaf6aebbae3c (diff)
downloadgit-a0a08d48d068551ea819847743d8f5a178b9f8ba.tar.gz
git-a0a08d48d068551ea819847743d8f5a178b9f8ba.tar.xz
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 '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 6b1fd1bfb..66199edd4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -202,6 +202,7 @@
/test-string-list
/test-subprocess
/test-svn-fe
+/test-urlmatch-normalization
/test-wildmatch
/common-cmds.h
*.tar.gz