@matheusbsbs / matheus-bagliano / commits / 400e74df98
Fork 0

Fix formatting for urls section of fetch, pull, and push manpages

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>

Theodore Ts'o committed Dec 30, 2006 at 20:03 UTC 400e74df98e0808ccf233025fe700a316f65854c
1 file changed +16 -7
Documentation/urls.txt
+16 -7
@@ -40,9 +40,11 @@ In addition to the above, as a short-hand, the name of a
40 file in `$GIT_DIR/remotes` directory can be given; the
41 named file should be in the following format:
42
43 - URL: one of the above URL format
44 - Push: <refspec>
45 - Pull: <refspec>
43 +------------
44 +URL: one of the above URL format
45 +Push: <refspec>
46 +Pull: <refspec>
47 +------------
48
49 Then such a short-hand is specified in place of
50 <repository> without <refspec> parameters on the command
@@ -54,10 +56,12 @@ be specified for additional branch mappings.
56 Or, equivalently, in the `$GIT_DIR/config` (note the use
57 of `fetch` instead of `Pull:`):
58
59 +------------
60 [remote "<remote>"]
61 url = <url>
62 push = <refspec>
63 fetch = <refspec>
64 +------------
65
66 The name of a file in `$GIT_DIR/branches` directory can be
67 specified as an older notation short-hand; the named
@@ -68,10 +72,15 @@ name of remote head (URL fragment notation).
72 without the fragment is equivalent to have this in the
73 corresponding file in the `$GIT_DIR/remotes/` directory.
74
71 - URL: <url>
72 - Pull: refs/heads/master:<remote>
75 +------------
76 +URL: <url>
77 +Pull: refs/heads/master:<remote>
78 +------------
79 +
80
81 while having `<url>#<head>` is equivalent to
82
76 - URL: <url>
77 - Pull: refs/heads/<head>:<remote>
83 +------------
84 +URL: <url>
85 +Pull: refs/heads/<head>:<remote>
86 +------------