diff options
| author |  Sam Vilain <sam.vilain@catalyst.net.nz> | 2007-11-23 13:07:00 +1300 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2007-12-03 22:11:53 -0800 |
| commit | 9c5665aa3c938b0e085ca34a8126110edcffa217 (patch) | |
| tree | b10f88b086253d085215cbfef72cff07b685339f /builtin-merge-ours.c | |
| parent | Trace and quote with argv: get rid of unneeded count argument. (diff) | |
| download | tgif-9c5665aa3c938b0e085ca34a8126110edcffa217.tar.xz | |
Allow HTTP proxy to be overridden in config
The http_proxy / HTTPS_PROXY variables used by curl to control
proxying may not be suitable for git. Allow the user to override them
in the configuration file.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-ours.c')
0 files changed, 0 insertions, 0 deletions