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

diff --cc Documentation/fetch-options.txt
Simple merge

diff --cc Documentation/git-push.txt
Simple merge

diff --cc builtin/clone.c
Simple merge

diff --cc builtin/fetch.c
index 8e742135f049c2792bfc5a20299dac88518929cc,89b71a8f852780dddd902a519d1183608040fe47..55919a9e4fb8e2fd538b6c111bfdacf83acf62ed
--- 1/builtin/fetch.c
--- 2/builtin/fetch.c
+++ b/builtin/fetch.c
@@@ -37,7 -37,7 +37,8 @@@ static int prune = -1; /* unspecified *
  static int all, append, dry_run, force, keep, multiple, update_head_ok, verbosity;
  static int progress = -1, recurse_submodules = RECURSE_SUBMODULES_DEFAULT;
  static int tags = TAGS_DEFAULT, unshallow, update_shallow;
 +static int max_children = 1;
+ static enum transport_family family;
  static const char *depth;
  static const char *upload_pack;
  static struct strbuf default_rla = STRBUF_INIT;

diff --cc builtin/push.c
Simple merge

diff --cc http.c
Simple merge

diff --cc http.h
Simple merge

diff --cc remote-curl.c
Simple merge

diff --cc transport-helper.c
Simple merge

diff --cc transport.c
Simple merge