summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-05-26 10:28:10 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-05-26 10:28:10 -0700
commitbac9c06ba093d9254cb2ab3eed074722a3e635a6 (patch)
treea635335f31f8f0dfa7a679882cfab42429851a9b /Documentation
parentMerge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix' into maint-1.7.4 (diff)
parenttest core.gitproxy configuration (diff)
downloadtgif-bac9c06ba093d9254cb2ab3eed074722a3e635a6.tar.xz
Merge branch 'jk/git-connection-deadlock-fix' into maint-1.7.4
* jk/git-connection-deadlock-fix: test core.gitproxy configuration send-pack: avoid deadlock on git:// push with failed pack-objects connect: let callers know if connection is a socket connect: treat generic proxy processes like ssh processes Conflicts: connect.c
Diffstat (limited to 'Documentation')
0 files changed, 0 insertions, 0 deletions