aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/git.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-03-16 13:16:40 -0700
committerJunio C Hamano <gitster@pobox.com>2016-03-16 13:16:40 -0700
commit9e689802e393b614ab9343dba2cee3828950f3ec (patch)
treec2116919f414f39f53e64cb46cd89124cd1a57a4 /Documentation/git.txt
parentc2c5f6b1e479f2c38e0e01345350620944e3527f (diff)
parent07c7782cc8e1f37c7255dfc69c5d0e3f4d4d728c (diff)
downloadgit-9e689802e393b614ab9343dba2cee3828950f3ec.tar.gz
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
Diffstat (limited to 'Documentation/git.txt')
-rw-r--r--Documentation/git.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 951b24661e..f9252d5591 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -1129,7 +1129,7 @@ of clones and fetches.
connection (or proxy, if configured)
- `ssh`: git over ssh (including `host:path` syntax,
- `git+ssh://`, etc).
+ `ssh://`, etc).
- `http`: git over http, both "smart http" and "dumb http".
Note that this does _not_ include `https`; if you want both,