Andrew's git / gitweb.git / diff
?
Merge branch 'jk/upload-pack-keepalive' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 17 Oct 2013 22:46:01 +0000 (15:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 17 Oct 2013 22:46:01 +0000 (15:46 -0700)
* jk/upload-pack-keepalive:
upload-pack: bump keepalive default to 5 seconds
upload-pack: send keepalive packets during pack computation

1  2 
Documentation/config.txt patch | diff1 | diff2 | blob | history
upload-pack.c patch | diff1 | diff2 | blob | history
diff --cc Documentation/config.txt
Simple merge
diff --cc upload-pack.c
Simple merge