diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-07-13 14:00:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-13 14:00:24 -0700 |
| commit | 0e521a41b526f6dbde76030ca7e7c1107115c120 (patch) | |
| tree | 3057303e75a8806c3938300c117d70216e6e37e6 /builtin/merge-ours.c | |
| parent | Merge branch 'jc/fsck-retire-require-eoh' (diff) | |
| parent | http: always use any proxy auth method available (diff) | |
| download | tgif-0e521a41b526f6dbde76030ca7e7c1107115c120.tar.xz | |
Merge branch 'et/http-proxyauth'
We used to ask libCURL to use the most secure authentication method
available when talking to an HTTP proxy only when we were told to
talk to one via configuration variables. We now ask libCURL to
always use the most secure authentication method, because the user
can tell libCURL to use an HTTP proxy via an environment variable
without using configuration variables.
* et/http-proxyauth:
http: always use any proxy auth method available
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions