Code

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)
commitbd33a29283819f1eb1b9ddcb3f1a22c268af8679
treef930e9e156b38ceef4ac3bdccb5cc29ff797461f
parentdc96c5ee703fb7265619b1ecb2b5f2c5ab3ef40d
parent27a557a9ff9273ad47aa29c52e9903cf6405f7f7
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
.gitignore
Makefile
builtin-archive.c