Skip to content

Commit 400e74d

Browse files
tytsoJunio C Hamano
authored andcommitted
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>
1 parent 22b6abc commit 400e74d

File tree

1 file changed

+16
-7
lines changed

1 file changed

+16
-7
lines changed

Documentation/urls.txt

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,11 @@ In addition to the above, as a short-hand, the name of a
4040
file in `$GIT_DIR/remotes` directory can be given; the
4141
named file should be in the following format:
4242

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+
------------
4648

4749
Then such a short-hand is specified in place of
4850
<repository> without <refspec> parameters on the command
@@ -54,10 +56,12 @@ be specified for additional branch mappings.
5456
Or, equivalently, in the `$GIT_DIR/config` (note the use
5557
of `fetch` instead of `Pull:`):
5658

59+
------------
5760
[remote "<remote>"]
5861
url = <url>
5962
push = <refspec>
6063
fetch = <refspec>
64+
------------
6165

6266
The name of a file in `$GIT_DIR/branches` directory can be
6367
specified as an older notation short-hand; the named
@@ -68,10 +72,15 @@ name of remote head (URL fragment notation).
6872
without the fragment is equivalent to have this in the
6973
corresponding file in the `$GIT_DIR/remotes/` directory.
7074

71-
URL: <url>
72-
Pull: refs/heads/master:<remote>
75+
------------
76+
URL: <url>
77+
Pull: refs/heads/master:<remote>
78+
------------
79+
7380

7481
while having `<url>#<head>` is equivalent to
7582

76-
URL: <url>
77-
Pull: refs/heads/<head>:<remote>
83+
------------
84+
URL: <url>
85+
Pull: refs/heads/<head>:<remote>
86+
------------

0 commit comments

Comments
 (0)