Merge branch 'jk/upload-pack-keepalive' into maint
commit9432c6aaa5d58d433b6e3e139998733d2e87d946
authorJunio C Hamano <gitster@pobox.com>
Thu, 17 Oct 2013 22:46:01 +0000 (17 15:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 17 Oct 2013 22:46:01 +0000 (17 15:46 -0700)
treea7af7f74e372de57dae0998660d7379c411bd241
parent968792eeeb51be4ff3218c89af00a987cdea8a9a
parent115dedd72223e101181363f4e6053b4c937fdc37
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
Documentation/config.txt
upload-pack.c