diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-01-13 12:30:39 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-13 12:30:39 -0800 |
| commit | bd33a29283819f1eb1b9ddcb3f1a22c268af8679 (patch) | |
| tree | f930e9e156b38ceef4ac3bdccb5cc29ff797461f /Documentation/git-merge-index.txt | |
| parent | Merge branch 'cc/reset-more' (diff) | |
| parent | Reset possible helper before reusing remote structure (diff) | |
| download | tgif-bd33a29283819f1eb1b9ddcb3f1a22c268af8679.tar.xz | |
Merge branch 'il/vcs-helper'
* il/vcs-helper:
Reset possible helper before reusing remote structure
Remove special casing of http, https and ftp
Support remote archive from all smart transports
Support remote helpers implementing smart transports
Support taking over transports
Refactor git transport options parsing
Pass unknown protocols to external protocol handlers
Support mandatory capabilities
Add remote helper debug mode
Conflicts:
Documentation/git-remote-helpers.txt
transport-helper.c
Diffstat (limited to 'Documentation/git-merge-index.txt')
0 files changed, 0 insertions, 0 deletions