diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-12-27 00:11:41 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-27 00:11:41 -0800 |
| commit | 9d540e97267fa94d9701d3e1aa5cdf2926858472 (patch) | |
| tree | 692790eca6a1f1ed5dd56a0f336bf910e76d15e5 /git-mergetool.sh | |
| parent | Merge branch 'cp/merge-continue' (diff) | |
| parent | http: respect protocol.*.allow=user for http-alternates (diff) | |
| download | tgif-9d540e97267fa94d9701d3e1aa5cdf2926858472.tar.xz | |
Merge branch 'bw/transport-protocol-policy'
Finer-grained control of what protocols are allowed for transports
during clone/fetch/push have been enabled via a new configuration
mechanism.
* bw/transport-protocol-policy:
http: respect protocol.*.allow=user for http-alternates
transport: add from_user parameter to is_transport_allowed
http: create function to get curl allowed protocols
transport: add protocol policy config option
http: always warn if libcurl version is too old
lib-proto-disable: variable name fix
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions