From: Junio C Hamano Date: Mon, 11 Feb 2008 19:10:33 GMT Subject: Re: [PATCH] git-pull documentation: fix linkgit in the --rebase option description. Message-ID: <7vve4v8g2e.fsf@gitster.siamese.dyndns.org> In-Reply-To: <20080211182907.GB25954@genesis.frugalware.org> Miklos Vajna 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.