summaryrefslogtreecommitdiff
path: root/t/t3310-notes-merge-manual-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-09-18 11:57:58 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-09-18 11:57:58 -0700
commit4b510c385ac47d35e0eea214990296a058aeb69e (patch)
tree4a204f6f4bfbe0a77dd46b425e3a0fc744588e29 /t/t3310-notes-merge-manual-resolve.sh
parentMerge branch 'jk/mailmap-incomplete-line' into maint (diff)
parentRevert "compat/clipped-write.c: large write(2) fails on Mac OS X/XNU" (diff)
downloadtgif-4b510c385ac47d35e0eea214990296a058aeb69e.tar.xz
Merge branch 'sp/clip-read-write-to-8mb' into maint
Send a large request to read(2)/write(2) as a smaller but still reasonably large chunks, which would improve the latency when the operation needs to be killed and incidentally works around broken 64-bit systems that cannot take a 2GB write or read in one go. * sp/clip-read-write-to-8mb: Revert "compat/clipped-write.c: large write(2) fails on Mac OS X/XNU" xread, xwrite: limit size of IO to 8MB
Diffstat (limited to 't/t3310-notes-merge-manual-resolve.sh')
0 files changed, 0 insertions, 0 deletions