diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-10-17 15:46:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-17 15:46:01 -0700 |
| commit | 9432c6aaa5d58d433b6e3e139998733d2e87d946 (patch) | |
| tree | a7af7f74e372de57dae0998660d7379c411bd241 /Documentation | |
| parent | 968792eeeb51be4ff3218c89af00a987cdea8a9a (diff) | |
| parent | 115dedd72223e101181363f4e6053b4c937fdc37 (diff) | |
| download | git-9432c6aaa5d58d433b6e3e139998733d2e87d946.tar.gz git-9432c6aaa5d58d433b6e3e139998733d2e87d946.tar.xz | |
Merge branch 'jk/upload-pack-keepalive' into maint
* jk/upload-pack-keepalive:
upload-pack: bump keepalive default to 5 seconds
upload-pack: send keepalive packets during pack computation
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index ec57a15ac..6b3557871 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2216,6 +2216,17 @@ uploadpack.allowtipsha1inwant:: of a hidden ref (by default, such a request is rejected). see also `uploadpack.hiderefs`. +uploadpack.keepalive:: + When `upload-pack` has started `pack-objects`, there may be a + quiet period while `pack-objects` prepares the pack. Normally + it would output progress information, but if `--quiet` was used + for the fetch, `pack-objects` will output nothing at all until + the pack data begins. Some clients and networks may consider + 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 5 seconds. + url.<base>.insteadOf:: Any URL that starts with this value will be rewritten to start, instead, with <base>. In cases where some site serves a |