summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-tree.txt
diff options
context:
space:
mode:
authorLibravatar Mika Fischer <mika.fischer@zoopnet.de>2011-11-04 15:19:27 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-11-04 10:47:13 -0700
commitdf26c471278f13ca6ad96b12a533ef4172323c13 (patch)
tree449705a9e769a8d16f5a6b36c38ecd2cf327f8e2 /Documentation/git-merge-tree.txt
parenthttp.c: Use timeout suggested by curl instead of fixed 50ms timeout (diff)
downloadtgif-df26c471278f13ca6ad96b12a533ef4172323c13.tar.xz
http.c: Rely on select instead of tracking whether data was received
Since now select is used with the file descriptors of the http connections, tracking whether data was received recently (and trying to read more in that case) is no longer necessary. Instead, always call select and rely on it to return as soon as new data can be read. Signed-off-by: Mika Fischer <mika.fischer@zoopnet.de> Helped-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-tree.txt')
0 files changed, 0 insertions, 0 deletions