diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-05-19 20:37:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-19 20:37:20 -0700 |
| commit | a66fae3827d4bf39ddfdc19bbb818d67e2a3c20a (patch) | |
| tree | 9466bc040243464bfc29c60b6f92ce4d33acd4c5 /Documentation/merge-options.txt | |
| parent | Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix' (diff) | |
| parent | test core.gitproxy configuration (diff) | |
| download | tgif-a66fae3827d4bf39ddfdc19bbb818d67e2a3c20a.tar.xz | |
Merge branch 'jk/git-connection-deadlock-fix'
* 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/merge-options.txt')
0 files changed, 0 insertions, 0 deletions