From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 17 Oct 2013 22:46:01 +0000 (-0700)
Subject: Merge branch 'jk/upload-pack-keepalive' into maint
X-Git-Tag: v1.8.4.2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9432c6aaa5d58d433b6e3e139998733d2e87d946;p=thirdparty%2Fgit.git

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
---

9432c6aaa5d58d433b6e3e139998733d2e87d946