]> rtime.felk.cvut.cz Git - git.git/commit
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)
commit7fd92d9ed0255faf64ed78f02eadc902c7824008
tree0d5eaf6c14aa0d0606f94253b8ff4de8a8c852a6
parentaddfb21a94fb4e6b9d07b270f7bb3748767a8f38
parentb90c95d90ed9e96a0c1515c00fa8c0f92a0cb130
Merge branch 'js/remote-add-with-insteadof'

"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