diff options
| -rw-r--r-- | Documentation/config.txt | 2 | ||||
| -rw-r--r-- | upload-pack.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 432c38c3f2..3fc08293b7 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2173,7 +2173,7 @@ uploadpack.keepalive:: the server to be hung and give up. Setting this option instructs `upload-pack` to send an empty keepalive packet every `uploadpack.keepalive` seconds. Setting this option to 0 - disables keepalive packets entirely. The default is 0. + disables keepalive packets entirely. The default is 5 seconds. url.<base>.insteadOf:: Any URL that starts with this value will be rewritten to diff --git a/upload-pack.c b/upload-pack.c index 289717ed5f..fb9be2a937 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -40,7 +40,7 @@ static struct object_array have_obj; static struct object_array want_obj; static struct object_array extra_edge_obj; static unsigned int timeout; -static int keepalive = -1; +static int keepalive = 5; /* 0 for no sideband, * otherwise maximum packet size (up to 65520 bytes). */ |