aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Ericsson <exon@op5.se>2005-11-17 20:37:14 +0100
committerJunio C Hamano <junkio@cox.net>2005-11-19 20:50:39 -0800
commit7b5d895da6d86eda36af84516a359192ca1da469 (patch)
treea6c1ccc463c99c89c564eeae018d5cbadcab049d
parentfaea9ccbadf75128a9e394dca80ed9454e19c7a9 (diff)
downloadgit-7b5d895da6d86eda36af84516a359192ca1da469.tar.gz
git-7b5d895da6d86eda36af84516a359192ca1da469.tar.xz
Documentation update for user-relative paths.
Signed-off-by: Andreas Ericsson <ae@op5.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--Documentation/pull-fetch-param.txt29
1 files changed, 24 insertions, 5 deletions
diff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt
index ddd5823df..a7628aa34 100644
--- a/Documentation/pull-fetch-param.txt
+++ b/Documentation/pull-fetch-param.txt
@@ -5,11 +5,30 @@
to name the remote repository:
+
===============================================================
-- Rsync URL: rsync://remote.machine/path/to/repo.git/
-- HTTP(s) URL: http://remote.machine/path/to/repo.git/
-- git URL: git://remote.machine/path/to/repo.git/
-- ssh URL: remote.machine:/path/to/repo.git/
-- Local directory: /path/to/repo.git/
+- rsync://host.xz/path/to/repo.git/
+- http://host.xz/path/to/repo.git/
+- https://host.xz/path/to/repo.git/
+- git://host.xz/path/to/repo.git/
+- ssh://host.xz/path/to/repo.git/
+- ssh://host.xz/~user/path/to/repo.git/
+- ssh://host.xz/~/path/to/repo.git
+===============================================================
++
+ SSH Is the default transport protocol and also supports an
+ scp-like syntax. Both syntaxes support username expansion.
+ The following three are identical to the last three above,
+ respectively:
++
+===============================================================
+- host.xz:/path/to/repo.git/
+- host.xz:~user/path/to/repo.git/
+- host.xz:path/to/repo.git
+===============================================================
++
+ To sync with a local directory, use:
+
+===============================================================
+- /path/to/repo.git/
===============================================================
+
In addition to the above, as a short-hand, the name of a