From: Junio C Hamano <gitster@pobox.com>
To: Miklos Vajna <vmiklos@frugalware.org>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>, git@vger.kernel.org
Subject: Re: [PATCH] git-pull documentation: fix linkgit in the --rebase option description.
Date: Mon, 11 Feb 2008 11:10:33 -0800 [thread overview]
Message-ID: <7vve4v8g2e.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20080211182907.GB25954@genesis.frugalware.org> (Miklos Vajna's message of "Mon, 11 Feb 2008 19:29:07 +0100")
Miklos Vajna <vmiklos@frugalware.org> writes:
> I see your point and i played with it a bit, no success so far. If it
> becomes a new paragraph, the linkgit: is not processed. maybe it's an
> asciidoc bug?
You probably meant to do this, then.
Documentation/git-pull.txt | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 4cc633a..179bdfc 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -39,11 +39,11 @@ include::merge-strategies.txt[]
there is a remote ref for the upstream branch, and this branch
was rebased since last fetched, the rebase uses that information
to avoid rebasing non-local changes.
-
- *NOTE:* This is a potentially _dangerous_ mode of operation.
- It rewrites history, which does not bode well when you
- published that history already. Do *not* use this option
- unless you have read linkgit:git-rebase[1] carefully.
++
+*NOTE:* This is a potentially _dangerous_ mode of operation.
+It rewrites history, which does not bode well when you
+published that history already. Do *not* use this option
+unless you have read linkgit:git-rebase[1] carefully.
\--no-rebase::
Override earlier \--rebase.
next prev parent reply other threads:[~2008-02-11 19:12 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-11 13:28 [PATCH] git-pull documentation: fix linkgit in the --rebase option description Miklos Vajna
2008-02-11 15:15 ` Johannes Schindelin
2008-02-11 18:29 ` Miklos Vajna
2008-02-11 19:10 ` Junio C Hamano [this message]
2008-02-11 21:13 ` Johannes Schindelin
2008-02-12 0:08 ` Miklos Vajna
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=7vve4v8g2e.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=vmiklos@frugalware.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).