Merge branch 'jc/remote-set-url-doc'
commitdb30b8333b24ef54d877ddbd5ac929779b45331e
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Feb 2015 19:44:59 +0000 (18 11:44 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Feb 2015 19:44:59 +0000 (18 11:44 -0800)
tree526f92025ef76ad205f6f5f9978eca8c3204f500
parentd3e73b5b312c91b3232a13936392b564a96a3cd1
parent697f652818f211aa48e3c007f25d6177647980c1
Merge branch 'jc/remote-set-url-doc'

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