summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-index.txt
diff options
context:
space:
mode:
authorLibravatar Ilari Liusvaara <ilari.liusvaara@elisanet.fi>2010-01-09 19:28:12 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-01-09 22:38:49 -0800
commit27a557a9ff9273ad47aa29c52e9903cf6405f7f7 (patch)
treeea1bead80a5cbadf90e7a47984bae5746a8962e4 /Documentation/git-merge-index.txt
parentRemove special casing of http, https and ftp (diff)
downloadtgif-27a557a9ff9273ad47aa29c52e9903cf6405f7f7.tar.xz
Reset possible helper before reusing remote structure
If one had multiple URLs configured for remote with previous one having forced helper but the subsequent one not, like: url = foo::bar://baz url = ssh://example/example.git Then the subsequent URL is passed to foo helper, which isn't correct. Fix it to be parsed normally by resetting foreign VCS name before parsing the URL protocol. Signed-off-by: Ilari Liusvaara <ilari.liusvaara@elisanet.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-index.txt')
0 files changed, 0 insertions, 0 deletions