Merge branch 'js/remote-add-with-insteadof'
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 Jan 2015 20:29:47 +0000 (12:29 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Jan 2015 20:29:47 +0000 (12:29 -0800)
"git remote add $name $URL" is now allowed when "url.$URL.insteadOf"
is already defined.

* js/remote-add-with-insteadof:
Add a regression test for 'git remote add <existing> <same-url>'
git remote: allow adding remotes agreeing with url.<...>.insteadOf

Trivial merge