From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 1 Jul 2013 19:41:43 +0000 (-0700)
Subject: Merge branch 'ft/doc-git-transport'
X-Git-Tag: v1.8.4-rc0~95
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/43f25ae7b8e02d224fd150cf365b28d1956cc8cf?hp=-c

Merge branch 'ft/doc-git-transport'

* ft/doc-git-transport:
documentation: add git:// transport security notice
---

43f25ae7b8e02d224fd150cf365b28d1956cc8cf
diff --combined Documentation/urls.txt
index 5e185f87c2,5992ede1d8..9ccb24677e
--- a/Documentation/urls.txt
+++ b/Documentation/urls.txt
@@@ -11,6 -11,9 +11,9 @@@ and ftps can be used for fetching and r
  and pushing, but these are inefficient and deprecated; do not use
  them).
  
+ The native transport (i.e. git:// URL) does no authentication and
+ should be used with caution on unsecured networks.
+ 
  The following syntaxes may be used with them:
  
  - ssh://{startsb}user@{endsb}host.xz{startsb}:port{endsb}/path/to/repo.git/
@@@ -23,12 -26,6 +26,12 @@@ An alternative scp-like syntax may als
  
  - {startsb}user@{endsb}host.xz:path/to/repo.git/
  
 +This syntax is only recognized if there are no slashes before the
 +first colon. This helps differentiate a local path that contains a
 +colon. For example the local path `foo:bar` could be specified as an
 +absolute path or `./foo:bar` to avoid being misinterpreted as an ssh
 +url.
 +
  The ssh and git protocols additionally support ~username expansion:
  
  - ssh://{startsb}user@{endsb}host.xz{startsb}:port{endsb}/~{startsb}user{endsb}/path/to/repo.git/
@@@ -39,7 -36,7 +42,7 @@@ For local repositories, also supported 
  syntaxes may be used:
  
  - /path/to/repo.git/
 -- file:///path/to/repo.git/
 +- \file:///path/to/repo.git/
  
  ifndef::git-clone[]
  These two syntaxes are mostly equivalent, except when cloning, when