diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-05-26 19:27:55 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-05-26 19:27:55 +0200 |
commit | 34df9fe36a3627e1c2a9ae244820fb61e3891b90 (patch) | |
tree | d33bcbf6d1cbc2512d1cbffa0a36bbfdf6bae991 /cache.h | |
parent | Merge branch 'jk/maint-upload-pack-shallow' into maint-1.7.4 (diff) | |
parent | Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/ma... (diff) | |
download | git-34df9fe36a3627e1c2a9ae244820fb61e3891b90.tar.xz git-34df9fe36a3627e1c2a9ae244820fb61e3891b90.zip |
Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix' into maint-1.7.4
* js/maint-send-pack-stateless-rpc-deadlock-fix:
sideband_demux(): fix decl-after-stmt
send-pack: unbreak push over stateless rpc
send-pack: avoid deadlock when pack-object dies early
Diffstat (limited to 'cache.h')
0 files changed, 0 insertions, 0 deletions