aboutsummaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-13 22:03:17 -0800
committerJunio C Hamano <gitster@pobox.com>2011-12-13 22:03:17 -0800
commitfc545433bdab7ec17e6609d2249771d407370a4d (patch)
tree3031c9ac8b14137516b0f6deb55f2084fcdb432b /git-am.sh
parentdf6246ed78d040f06f095dd62d8db07a0aa19a96 (diff)
parent093c44a3600323c3ca7a8d28a0d2ba2bc145dd47 (diff)
downloadgit-fc545433bdab7ec17e6609d2249771d407370a4d.tar.gz
git-fc545433bdab7ec17e6609d2249771d407370a4d.tar.xz
Merge branch 'mf/curl-select-fdset' into maint
* mf/curl-select-fdset: http: drop "local" member from request struct http.c: Rely on select instead of tracking whether data was received http.c: Use timeout suggested by curl instead of fixed 50ms timeout http.c: Use curl_multi_fdset to select on curl fds instead of just sleeping
Diffstat (limited to 'git-am.sh')
0 files changed, 0 insertions, 0 deletions