Merge branch 'jc/remote-set-url-doc' into next
commit1f9c34286643d962f9fb13c2f33cb4a8da994e56
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Feb 2015 23:10:17 +0000 (16 15:10 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Feb 2015 23:10:17 +0000 (16 15:10 -0800)
tree494388660de475e1786128a662f64107cba61f32
parente2daf109a1c9ea36d360f6ca96f5686293c7c76f
parent697f652818f211aa48e3c007f25d6177647980c1
Merge branch 'jc/remote-set-url-doc' into next

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