diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-05-26 09:33:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-26 09:33:25 -0700 |
| commit | 5590fe762ff9d68f6968d80979e446576e61e2e1 (patch) | |
| tree | 0900e26fc5c06b94be0cab1aac91ccb3b89c7edd /show-index.c | |
| parent | Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix' into maint (diff) | |
| parent | test core.gitproxy configuration (diff) | |
| download | tgif-5590fe762ff9d68f6968d80979e446576e61e2e1.tar.xz | |
Merge branch 'jk/git-connection-deadlock-fix' into maint
* 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 'show-index.c')
0 files changed, 0 insertions, 0 deletions