OSDN Git Service

Merge branch 'et/spell-poll-infinite-with-minus-one-only' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2014 21:05:13 +0000 (14:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2014 21:05:13 +0000 (14:05 -0700)
* et/spell-poll-infinite-with-minus-one-only:
  upload-pack: keep poll(2)'s timeout to -1

1  2 
upload-pack.c

diff --cc upload-pack.c
Simple merge