Merge branch 'jc/remote-set-url-doc' into maint
commit069dea89cf2f09101e3ca9a9b3c7a216d61aac10
authorJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2015 21:13:03 +0000 (5 13:13 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2015 21:13:03 +0000 (5 13:13 -0800)
treeea07fa1cbb5592b866105efef439d30c88d548b6
parentabfed73ce8890db85e1a5851b4678321b0d1e8cc
parent697f652818f211aa48e3c007f25d6177647980c1
Merge branch 'jc/remote-set-url-doc' into maint

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