![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 22b6abc)
raw | patch | inline | side by side (parent: 22b6abc)
| author | Theodore Ts'o <tytso@mit.edu> | |
| Sun, 31 Dec 2006 01:03:51 +0000 (20:03 -0500) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 31 Dec 2006 02:19:19 +0000 (18:19 -0800) |
The line:
[remote "<remote>"]
was getting swallowed up by asciidoc, causing a critical line in the
explanation for how to store the .git/remotes information in .git/config
to go missing from the git-fetch, git-pull, and git-push manpages.
Put all of the examples into delimited blocks to fix this problem and to
make them look nicer.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
[remote "<remote>"]
was getting swallowed up by asciidoc, causing a critical line in the
explanation for how to store the .git/remotes information in .git/config
to go missing from the git-fetch, git-pull, and git-push manpages.
Put all of the examples into delimited blocks to fix this problem and to
make them look nicer.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| Documentation/urls.txt | patch | blob | history |
diff --git a/Documentation/urls.txt b/Documentation/urls.txt
index 670827c323fe276124ba1a84d59386771db868f1..870c95073bbbb74e6d40ea1dd5dc642410bc9153 100644 (file)
--- a/Documentation/urls.txt
+++ b/Documentation/urls.txt
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>
+------------
+URL: one of the above URL format
+Push: <refspec>
+Pull: <refspec>
+------------
Then such a short-hand is specified in place of
<repository> without <refspec> parameters on the command
Or, equivalently, in the `$GIT_DIR/config` (note the use
of `fetch` instead of `Pull:`):
+------------
[remote "<remote>"]
url = <url>
push = <refspec>
fetch = <refspec>
+------------
The name of a file in `$GIT_DIR/branches` directory can be
specified as an older notation short-hand; the named
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>
+------------
+URL: <url>
+Pull: refs/heads/master:<remote>
+------------
+
while having `<url>#<head>` is equivalent to
- URL: <url>
- Pull: refs/heads/<head>:<remote>
+------------
+URL: <url>
+Pull: refs/heads/<head>:<remote>
+------------