From: Theodore Tso <tytso@mit.edu>
To: git@vger.kernel.org
Subject: [PATCH, UPDATED] Fix formatting for urls section of fetch, pull, and push manpages
Date: Sat, 30 Dec 2006 23:11:52 -0500 [thread overview]
Message-ID: <20061231041152.GA791@thunk.org> (raw)
In-Reply-To: <E1H0p79-0004T8-8V@candygram.thunk.org>
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>
[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: <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>
+------------
--
1.5.0.rc0.g1d42
prev parent reply other threads:[~2006-12-31 12:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-31 1:03 [PATCH] Fix formatting for urls section of fetch, pull, and push manpages Theodore Ts'o
2006-12-31 4:11 ` Theodore Tso [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20061231041152.GA791@thunk.org \
--to=tytso@mit.edu \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.