kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Theodore Ts'o 2006-12-30 20:03:51 -05:00 committed by Junio C Hamano
parent 22b6abcd08
commit 400e74df98
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Documentation/urls.txt
View File

@ -40,9 +40,11 @@ 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>
------------

Then such a short-hand is specified in place of
<repository> without <refspec> parameters on the command
@ -54,10 +56,12 @@ be specified for additional branch mappings.
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
@ -68,10 +72,15 @@ name of remote head (URL fragment notation).
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>
------------