# [PATCH] git-pull documentation: fix linkgit in the --rebase option description. 6 messages from 2008-02-11 to 2008-02-12. Participants: Miklos Vajna, Johannes Schindelin, Junio C Hamano. Thread: https://gitlist.dev/t/12033 ## Miklos Vajna, 2008-02-11 13:28 Subject: [PATCH] git-pull documentation: fix linkgit in the --rebase option description. Message-ID: <20080211132800.GV25954@genesis.frugalware.org> URL: https://gitlist.dev/e/20080211132800.GV25954%40genesis.frugalware.org ``` We do not have newlines before NOTEs at other places either, like git clone -s documentation and removing that newline turns 'linkgit:git\-rebase[1]' to '\fBgit-rebase\fR(1)' properly. Signed-off-by: Miklos Vajna --- Documentation/git-pull.txt | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 4cc633a..b9bc6ed 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -39,7 +39,6 @@ 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 -- 1.5.4 ``` ## Johannes Schindelin, 2008-02-11 15:15 Subject: Re: [PATCH] git-pull documentation: fix linkgit in the --rebase option description. Message-ID: URL: https://gitlist.dev/e/alpine.LSU.1.00.0802111514400.3870%40racer.site In-Reply-To: <20080211132800.GV25954@genesis.frugalware.org> ``` Hi, On Mon, 11 Feb 2008, Miklos Vajna wrote: > diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt > index 4cc633a..b9bc6ed 100644 > --- a/Documentation/git-pull.txt > +++ b/Documentation/git-pull.txt > @@ -39,7 +39,6 @@ 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 The intention was to force a new paragraph. The *NOTE* should be loud and clear, so that those few people who read man pages are properly warned that --rebase is a dangerous option if you do not know what you are doing. Ciao, Dscho ``` ## Miklos Vajna, 2008-02-11 18:29 Subject: Re: [PATCH] git-pull documentation: fix linkgit in the --rebase option description. Message-ID: <20080211182907.GB25954@genesis.frugalware.org> URL: https://gitlist.dev/e/20080211182907.GB25954%40genesis.frugalware.org In-Reply-To: ``` On Mon, Feb 11, 2008 at 03:15:31PM +0000, Johannes Schindelin wrote: > The intention was to force a new paragraph. The *NOTE* should be loud and > clear, so that those few people who read man pages are properly warned > that --rebase is a dangerous option if you do not know what you are doing. 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? (is it better to have it as a new paragraph with linkgit: shown? hmm) thanks, - VMiklos ``` ## Junio C Hamano, 2008-02-11 19:10 Subject: Re: [PATCH] git-pull documentation: fix linkgit in the --rebase option description. Message-ID: <7vve4v8g2e.fsf@gitster.siamese.dyndns.org> URL: https://gitlist.dev/e/7vve4v8g2e.fsf%40gitster.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. ``` ## Johannes Schindelin, 2008-02-11 21:13 Subject: Re: [PATCH] git-pull documentation: fix linkgit in the --rebase option description. Message-ID: URL: https://gitlist.dev/e/alpine.LSU.1.00.0802112112560.3870%40racer.site In-Reply-To: <7vve4v8g2e.fsf@gitster.siamese.dyndns.org> ``` Hi, On Mon, 11 Feb 2008, Junio C Hamano wrote: > 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. Thanks. At some point, it feels (at least to me) that the ease of use of asciidoc just vanishes... Ciao, Dscho ``` ## Miklos Vajna, 2008-02-12 00:08 Subject: Re: [PATCH] git-pull documentation: fix linkgit in the --rebase option description. Message-ID: <20080212000812.GF25954@genesis.frugalware.org> URL: https://gitlist.dev/e/20080212000812.GF25954%40genesis.frugalware.org In-Reply-To: <7vve4v8g2e.fsf@gitster.siamese.dyndns.org> ``` On Mon, Feb 11, 2008 at 11:10:33AM -0800, Junio C Hamano wrote: > > 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. ah, great. then i'll send a patch to change git clone -s' NOTE like this. thanks, - VMiklos ```