Fix formatting for urls section of fetch, pull, and push manpages
PATCH 1/1 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.
--- Documentation/urls.txt | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 deletions(-)
Documentation/urls.txt +16 -7
@@ -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> +------------ +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> +------------ +URL: <url> +Pull: refs/heads/master:<remote> +------------ + while having `<url>#<head>` is equivalent to - URL: <url> - Pull: refs/heads/<head>:<remote> +------------ +URL: <url> +Pull: refs/heads/<head>:<remote> +------------
Signature · 1 line
1.5.0.rc0.g1ed48
PATCH 1/1 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.
[Updated to make thee nroff'ed man pages look nicer]
--- Documentation/urls.txt | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-)
Documentation/urls.txt +15 -4
@@ -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: <refspec> Pull: <refspec> +------------ + Then such a short-hand is specified in place of <repository> without <refspec> parameters on the command line, <refspec> 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 "<remote>"] - url = <url> - push = <refspec> - fetch = <refspec> +------------ + [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 +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: <url> Pull: refs/heads/master:<remote> +------------ + while having `<url>#<head>` is equivalent to +------------ URL: <url> Pull: refs/heads/<head>:<remote> +------------
Signature · 1 line
1.5.0.rc0.g1d42