summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-tree.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-09-09 14:50:32 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-09-09 14:50:36 -0700
commita0a08d48d068551ea819847743d8f5a178b9f8ba (patch)
treeb8c05ed186dfe1da37b515301f9775f18511704e /Documentation/git-merge-tree.txt
parentMerge branch 'jl/submodule-mv' (diff)
parentbuiltin/config.c: compilation fix (diff)
downloadtgif-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 'Documentation/git-merge-tree.txt')
0 files changed, 0 insertions, 0 deletions