Merge branch 'il/vcs-helper'
authorJunio C Hamano <gitster@pobox.com>
Wed, 13 Jan 2010 20:30:39 +0000 (12:30 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 13 Jan 2010 20:30:39 +0000 (12:30 -0800)
* 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

1  2 
.gitignore
Makefile
builtin-archive.c
diff --cc .gitignore
Simple merge
diff --cc Makefile
Simple merge
Simple merge