diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-04-25 15:20:39 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-04-25 15:23:23 -0700 |
commit | 73776dc1ebb61bc797e9f2fcfdfcd773511dfb8a (patch) | |
tree | 2056157e6ce9687b6ab843cdba4afcf512ecd4da /Documentation/date-formats.txt | |
parent | Enable threaded async procedures whenever pthreads is available (diff) | |
parent | send-pack: avoid deadlock when pack-object dies early (diff) | |
download | tgif-73776dc1ebb61bc797e9f2fcfdfcd773511dfb8a.tar.xz |
Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/maint-send-pack-stateless-rpc-deadlock-fix
* js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix:
send-pack: avoid deadlock when pack-object dies early
Evil merge to adjust the way the use of pthreads in sideband-demultiplexor
was decided (earlier it was "if we are not on Windows", now it is "if we
are not using pthreads").
Diffstat (limited to 'Documentation/date-formats.txt')
0 files changed, 0 insertions, 0 deletions