From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 16 Mar 2016 20:16:40 +0000 (-0700)
Subject: Merge branch 'cn/deprecate-ssh-git-url'
X-Git-Tag: v2.8.0-rc3~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9e689802e393b614ab9343dba2cee3828950f3ec;p=thirdparty%2Fgit.git

Merge branch 'cn/deprecate-ssh-git-url'

The two alternative ways to spell "ssh://" transport have been
deprecated for a long time.  The last mention of them has finally
removed from the documentation.

* cn/deprecate-ssh-git-url:
  Disown ssh+git and git+ssh
---

9e689802e393b614ab9343dba2cee3828950f3ec
diff --cc Documentation/git.txt
index 951b24661e,2f90635d5c..f9252d5591
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -1129,8 -1122,10 +1129,8 @@@ of clones and fetches
  	    connection (or proxy, if configured)
  
  	  - `ssh`: git over ssh (including `host:path` syntax,
- 	    `git+ssh://`, etc).
+ 	    `ssh://`, etc).
  
 -	  - `rsync`: git over rsync
 -
  	  - `http`: git over http, both "smart http" and "dumb http".
  	    Note that this does _not_ include `https`; if you want both,
  	    you should specify both as `http:https`.