From: Theodore Tso Date: Sun, 31 Dec 2006 04:11:52 GMT Subject: [PATCH, UPDATED] Fix formatting for urls section of fetch, pull, and push manpages Message-ID: <20061231041152.GA791@thunk.org> In-Reply-To: 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" [Updated to make thee nroff'ed man pages look nicer] --- Documentation/urls.txt | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Documentation/urls.txt b/Documentation/urls.txt index 670827c..745f967 100644 --- a/Documentation/urls.txt +++ b/Documentation/urls.txt @@ -40,10 +40,13 @@ 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: +------------ + Then such a short-hand is specified in place of without parameters on the command line, specified on `Push:` lines or `Pull:` @@ -54,10 +57,13 @@ 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 = +------------ + [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 +74,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: +------------ + while having `#` is equivalent to +------------ URL: Pull: refs/heads/: +------------ -- 1.5.0.rc0.g1d42