diff options
| author | J. Bruce Fields <bfields@fieldses.org> | 2006-02-05 18:29:49 -0500 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-06 21:14:56 -0800 |
| commit | 85a97d4e10c1ac4b87e856e2efe7bcd53d6868c3 (patch) | |
| tree | fb740671a4739b1e0d339512d51f32bb32f44c98 /Documentation/urls.txt | |
| parent | 3598a308086d4a41cab1e941df7763f2004e53c5 (diff) | |
| download | git-85a97d4e10c1ac4b87e856e2efe7bcd53d6868c3.tar.gz git-85a97d4e10c1ac4b87e856e2efe7bcd53d6868c3.tar.xz | |
Docs: move git url and remotes text to separate sections
The sections on git urls and remotes files in the git-fetch,
git-pull, and git-push manpages seem long enough to be worth a
manpage section of their own.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/urls.txt')
| -rw-r--r-- | Documentation/urls.txt | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/Documentation/urls.txt b/Documentation/urls.txt index e027c71e0..74774134e 100644 --- a/Documentation/urls.txt +++ b/Documentation/urls.txt @@ -1,6 +1,9 @@ +GIT URLS[[URLS]] +---------------- + One of the following notations can be used to name the remote repository: -+ + =============================================================== - rsync://host.xz/path/to/repo.git/ - http://host.xz/path/to/repo.git/ @@ -11,39 +14,42 @@ to name the remote repository: - 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, as does the native git protocol. 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/ =============================================================== -+ + +REMOTES +------- + In addition to the above, as a short-hand, the name of a file in `$GIT_DIR/remotes` directory can be given; the named file should be in the following format: -+ + URL: one of the above URL format Push: <refspec> Pull: <refspec> -+ -When such a short-hand is specified in place of + +Then such a short-hand is specified in place of <repository> without <refspec> parameters on the command line, <refspec> specified on `Push:` lines or `Pull:` lines are used for `git-push` and `git-fetch`/`git-pull`, respectively. Multiple `Push:` and and `Pull:` lines may be specified for additional branch mappings. -+ + The name of a file in `$GIT_DIR/branches` directory can be specified as an older notation short-hand; the named file should contain a single line, a URL in one of the @@ -52,11 +58,11 @@ name of remote head (URL fragment notation). `$GIT_DIR/branches/<remote>` file that stores a <url> without the fragment is equivalent to have this in the corresponding file in the `$GIT_DIR/remotes/` directory. -+ + URL: <url> Pull: refs/heads/master:<remote> -+ + while having `<url>#<head>` is equivalent to -+ + URL: <url> Pull: refs/heads/<head>:<remote> |