Merge branch 'ew/force-ipv4'

"git fetch" and friends that make network connections can now be
told to only use ipv4 (or ipv6).

* ew/force-ipv4:
  connect & http: support -4 and -6 switches for remote operations

1 files changed, 1 insertions, 0 deletions

diff --git a/http.h b/http.h
index f83cfa6868..4ef4bbda7d 100644
--- a/http.h
+++ b/http.h
@@ -107,6 +107,7 @@ extern void http_init(struct remote *remote, const char *url,
 		      int proactive_auth);
 extern void http_cleanup(void);
 
+extern long int git_curl_ipresolve;
 extern int active_requests;
 extern int http_is_verbose;
 extern size_t http_post_buffer;