{"thread":{"id":"12033","subject":"[PATCH] git-pull documentation: fix linkgit in the --rebase option description.","startedAt":"2008-02-11T13:28:00Z","lastAt":"2008-02-12T00:08:12Z","messageCount":6,"participants":["Miklos Vajna","Johannes Schindelin","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"68387","messageId":"20080211132800.GV25954@genesis.frugalware.org","threadId":"12033","inReplyTo":null,"subject":"[PATCH] git-pull documentation: fix linkgit in the --rebase option description.","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-02-11T13:28:00Z","receivedAt":"2008-02-11T13:28:00Z","isPatch":true,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"We do not have newlines before NOTEs at other places either, like git clone -s\ndocumentation and removing that newline turns 'linkgit:git\\-rebase[1]' to\n'\\fBgit-rebase\\fR(1)' properly.\n\nSigned-off-by: Miklos Vajna \n---\n Documentation/git-pull.txt | 1 -\n 1 files changed, 0 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt\nindex 4cc633a..b9bc6ed 100644\n--- a/Documentation/git-pull.txt\n+++ b/Documentation/git-pull.txt\n@@ -39,7 +39,6 @@ include::merge-strategies.txt[]\n \tthere is a remote ref for the upstream branch, and this branch\n \twas rebased since last fetched, the rebase uses that information\n \tto avoid rebasing non-local changes.\n-\n \t*NOTE:* This is a potentially _dangerous_ mode of operation.\n \tIt rewrites history, which does not bode well when you\n \tpublished that history already. Do *not* use this option\n-- \n1.5.4\n"},{"id":"68395","messageId":"alpine.LSU.1.00.0802111514400.3870@racer.site","threadId":"12033","inReplyTo":"20080211132800.GV25954@genesis.frugalware.org","subject":"Re: [PATCH] git-pull documentation: fix linkgit in the --rebase option description.","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-02-11T15:15:31Z","receivedAt":"2008-02-11T15:15:31Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Mon, 11 Feb 2008, Miklos Vajna wrote:\n\n> diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt\n> index 4cc633a..b9bc6ed 100644\n> --- a/Documentation/git-pull.txt\n> +++ b/Documentation/git-pull.txt\n> @@ -39,7 +39,6 @@ include::merge-strategies.txt[]\n> \tthere is a remote ref for the upstream branch, and this branch\n> \twas rebased since last fetched, the rebase uses that information\n> \tto avoid rebasing non-local changes.\n> -\n> \t*NOTE:* This is a potentially _dangerous_ mode of operation.\n> \tIt rewrites history, which does not bode well when you\n> \tpublished that history already. Do *not* use this option\n\nThe intention was to force a new paragraph. The *NOTE* should be loud and \nclear, so that those few people who read man pages are properly warned \nthat --rebase is a dangerous option if you do not know what you are doing.\n\nCiao,\nDscho\n"},{"id":"68416","messageId":"20080211182907.GB25954@genesis.frugalware.org","threadId":"12033","inReplyTo":"alpine.LSU.1.00.0802111514400.3870@racer.site","subject":"Re: [PATCH] git-pull documentation: fix linkgit in the --rebase option description.","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-02-11T18:29:07Z","receivedAt":"2008-02-11T18:29:07Z","isPatch":true,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"On Mon, Feb 11, 2008 at 03:15:31PM +0000, Johannes Schindelin wrote:\n> The intention was to force a new paragraph. The *NOTE* should be loud and \n> clear, so that those few people who read man pages are properly warned \n> that --rebase is a dangerous option if you do not know what you are doing.\n\ni see your point and i played with it a bit, no success so far. if it\nbecomes a new paragraph, the linkgit: is not processed. maybe it's an\nasciidoc bug?\n\n(is it better to have it as a new paragraph with linkgit: shown? hmm)\n\nthanks,\n- VMiklos\n"},{"id":"68423","messageId":"7vve4v8g2e.fsf@gitster.siamese.dyndns.org","threadId":"12033","inReplyTo":"20080211182907.GB25954@genesis.frugalware.org","subject":"Re: [PATCH] git-pull documentation: fix linkgit in the --rebase option description.","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-02-11T19:10:33Z","receivedAt":"2008-02-11T19:10:33Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Miklos Vajna writes:\n\n> I see your point and i played with it a bit, no success so far. If it\n> becomes a new paragraph, the linkgit: is not processed. maybe it's an\n> asciidoc bug?\n\nYou probably meant to do this, then.\n\n\n Documentation/git-pull.txt | 10 +++++-----\n 1 files changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt\nindex 4cc633a..179bdfc 100644\n--- a/Documentation/git-pull.txt\n+++ b/Documentation/git-pull.txt\n@@ -39,11 +39,11 @@ include::merge-strategies.txt[]\n \tthere is a remote ref for the upstream branch, and this branch\n \twas rebased since last fetched, the rebase uses that information\n \tto avoid rebasing non-local changes.\n-\n-\t*NOTE:* This is a potentially _dangerous_ mode of operation.\n-\tIt rewrites history, which does not bode well when you\n-\tpublished that history already. Do *not* use this option\n-\tunless you have read linkgit:git-rebase[1] carefully.\n++\n+*NOTE:* This is a potentially _dangerous_ mode of operation.\n+It rewrites history, which does not bode well when you\n+published that history already. Do *not* use this option\n+unless you have read linkgit:git-rebase[1] carefully.\n \n \\--no-rebase::\n \tOverride earlier \\--rebase.\n"},{"id":"68441","messageId":"alpine.LSU.1.00.0802112112560.3870@racer.site","threadId":"12033","inReplyTo":"7vve4v8g2e.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] git-pull documentation: fix linkgit in the --rebase option description.","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-02-11T21:13:49Z","receivedAt":"2008-02-11T21:13:49Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Mon, 11 Feb 2008, Junio C Hamano wrote:\n\n> Miklos Vajna writes:\n> \n> > I see your point and i played with it a bit, no success so far. If it\n> > becomes a new paragraph, the linkgit: is not processed. maybe it's an\n> > asciidoc bug?\n> \n> You probably meant to do this, then.\n\nThanks. At some point, it feels (at least to me) that the ease of \nuse of asciidoc just vanishes...\n\nCiao,\nDscho\n"},{"id":"68465","messageId":"20080212000812.GF25954@genesis.frugalware.org","threadId":"12033","inReplyTo":"7vve4v8g2e.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] git-pull documentation: fix linkgit in the --rebase option description.","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-02-12T00:08:12Z","receivedAt":"2008-02-12T00:08:12Z","isPatch":true,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"On Mon, Feb 11, 2008 at 11:10:33AM -0800, Junio C Hamano wrote:\n> > I see your point and i played with it a bit, no success so far. If it\n> > becomes a new paragraph, the linkgit: is not processed. maybe it's an\n> > asciidoc bug?\n> \n> You probably meant to do this, then.\n\nah, great. then i'll send a patch to change git clone -s' NOTE like\nthis.\n\nthanks,\n- VMiklos\n"}]}