From: Theodore Ts'o Date: Sun, 31 Dec 2006 01:03:51 +0000 (-0500) Subject: Fix formatting for urls section of fetch, pull, and push manpages X-Git-Tag: v1.5.0-rc1~144 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=400e74df98e0808ccf233025fe700a316f65854c;p=git.git Fix formatting for urls section of fetch, pull, and push manpages The line: [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" Signed-off-by: Junio C Hamano --- diff --git a/Documentation/urls.txt b/Documentation/urls.txt index 670827c32..870c95073 100644 --- a/Documentation/urls.txt +++ b/Documentation/urls.txt @@ -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: - Pull: +------------ +URL: one of the above URL format +Push: +Pull: +------------ Then such a short-hand is specified in place of without 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 ""] url = push = fetch = +------------ 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: - Pull: refs/heads/master: +------------ +URL: +Pull: refs/heads/master: +------------ + while having `#` is equivalent to - URL: - Pull: refs/heads/: +------------ +URL: +Pull: refs/heads/: +------------