diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2006-12-30 20:03:51 -0500 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-30 18:19:19 -0800 |
| commit | 400e74df98e0808ccf233025fe700a316f65854c (patch) | |
| tree | 3e70973903268ec09fdcd4c25174ec520da23897 | |
| parent | 22b6abcd0872c50f4bff47e96819a86db4bb6e61 (diff) | |
| download | git-400e74df98e0808ccf233025fe700a316f65854c.tar.gz git-400e74df98e0808ccf233025fe700a316f65854c.tar.xz | |
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>
| -rw-r--r-- | Documentation/urls.txt | 23 |
1 files changed, 16 insertions, 7 deletions
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: <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> +------------ |