Merge branch 'jc/remote-set-url-doc'
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Feb 2015 19:44:59 +0000 (11:44 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Feb 2015 19:44:59 +0000 (11:44 -0800)
Clarify in the documentation that "remote.<nick>.pushURL" and
"remote.<nick>.URL" are there to name the same repository accessed
via different transports, not two separate repositories.

* jc/remote-set-url-doc:
Documentation/git-remote.txt: stress that set-url is not for triangular

Trivial merge