summaryrefslogtreecommitdiff
path: root/builtin/commit-tree.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-02-03 14:16:08 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-02-03 14:16:08 -0800
commit30f302f7e7f407c0444b32e264aaa72c4081011e (patch)
treebc1409a1c5a3a96a7cd0e603a56e73daebca8ed3 /builtin/commit-tree.c
parentMerge branch 'jk/ref-cache-non-repository-optim' (diff)
parenthttp: use credential API to handle proxy authentication (diff)
downloadtgif-30f302f7e7f407c0444b32e264aaa72c4081011e.tar.xz
Merge branch 'kf/http-proxy-auth-methods'
New http.proxyAuthMethod configuration variable can be used to specify what authentication method to use, as a way to work around proxies that do not give error response expected by libcurl when CURLAUTH_ANY is used. Also, the codepath for proxy authentication has been taught to use credential API to store the authentication material in user's keyrings. * kf/http-proxy-auth-methods: http: use credential API to handle proxy authentication http: allow selection of proxy authentication method
Diffstat (limited to 'builtin/commit-tree.c')
0 files changed, 0 insertions, 0 deletions