diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-10-10 15:50:57 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-10-10 15:50:57 -0700 |
commit | 6631a0922904694033bd0c6951383eaa7efdb46e (patch) | |
tree | 60a3e665419a49a273913aae2750795932fc270b /git-pull.html | |
parent | f9ad45cd463e4831a81312a8db7a86e4217b8990 (diff) | |
download | git-htmldocs-6631a0922904694033bd0c6951383eaa7efdb46e.tar.gz |
Autogenerated HTML docs for v1.8.0-rc1-18-gc5fe2
Diffstat (limited to 'git-pull.html')
-rw-r--r-- | git-pull.html | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/git-pull.html b/git-pull.html index a2f79d859..393892794 100644 --- a/git-pull.html +++ b/git-pull.html @@ -1131,8 +1131,11 @@ A parameter <ref> without a colon is equivalent to address of the remote server, and the path to the repository.
Depending on the transport protocol, some of this information may be
absent.</p></div>
-<div class="paragraph"><p>Git natively supports ssh, git, http, https, ftp, ftps, and rsync
-protocols. The following syntaxes may be used with them:</p></div>
+<div class="paragraph"><p>Git supports ssh, git, http, and https protocols (in addition, ftp,
+and ftps can be used for fetching and rsync can be used for fetching
+and pushing, but these are inefficient and deprecated; do not use
+them).</p></div>
+<div class="paragraph"><p>The following syntaxes may be used with them:</p></div>
<div class="ulist"><ul>
<li>
<p>
|