summaryrefslogtreecommitdiff
path: root/t/t7606-merge-custom.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-05-26 10:27:55 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-05-26 10:27:55 -0700
commit34df9fe36a3627e1c2a9ae244820fb61e3891b90 (patch)
treed33bcbf6d1cbc2512d1cbffa0a36bbfdf6bae991 /t/t7606-merge-custom.sh
parentMerge branch 'jk/maint-upload-pack-shallow' into maint-1.7.4 (diff)
parentMerge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/ma... (diff)
downloadtgif-34df9fe36a3627e1c2a9ae244820fb61e3891b90.tar.xz
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 't/t7606-merge-custom.sh')
0 files changed, 0 insertions, 0 deletions