{"thread":{"id":"50610","subject":"[PATCH] rebase docs: fix \"gitlink\" typo","startedAt":"2019-02-28T02:43:27Z","lastAt":"2019-03-03T01:24:30Z","messageCount":3,"participants":["Kyle Meyer","Martin Ågren","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"370347","messageId":"20190228024315.1470303-1-kyle@kyleam.com","threadId":"50610","inReplyTo":null,"subject":"[PATCH] rebase docs: fix \"gitlink\" typo","fromName":"Kyle Meyer","fromEmail":"kyle@kyleam.com","sentAt":"2019-02-28T02:43:15Z","receivedAt":"2019-02-28T02:43:27Z","isPatch":true,"sender":{"key":"kyle@kyleam.com","avatar":"https://avatars.githubusercontent.com/u/1297788?v=4"},"body":"Change it to \"linkgit\" so that the reference is properly rendered.\n\nSigned-off-by: Kyle Meyer <kyle@kyleam.com>\n---\n Documentation/git-rebase.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\nindex 5629ba4c5d..6363d674b7 100644\n--- a/Documentation/git-rebase.txt\n+++ b/Documentation/git-rebase.txt\n@@ -410,7 +410,7 @@ See also INCOMPATIBLE OPTIONS below.\n +\n By default, or when `no-rebase-cousins` was specified, commits which do not\n have `<upstream>` as direct ancestor will keep their original branch point,\n-i.e. commits that would be excluded by gitlink:git-log[1]'s\n+i.e. commits that would be excluded by linkgit:git-log[1]'s\n `--ancestry-path` option will keep their original ancestry by default. If\n the `rebase-cousins` mode is turned on, such commits are instead rebased\n onto `<upstream>` (or `<onto>`, if specified).\n-- \n2.21.0\n\n"},{"id":"370356","messageId":"CAN0heSo5qsd4t_mgt90ws2hCp3O0qch_9MgXuzj-4FS2gG+bkA@mail.gmail.com","threadId":"50610","inReplyTo":"20190228024315.1470303-1-kyle@kyleam.com","subject":"Re: [PATCH] rebase docs: fix \"gitlink\" typo","fromName":"Martin Ågren","fromEmail":"martin.agren@gmail.com","sentAt":"2019-02-28T09:13:11Z","receivedAt":"2019-02-28T09:13:29Z","isPatch":true,"sender":{"key":"martin.agren@gmail.com","avatar":null},"body":"On Thu, 28 Feb 2019 at 03:44, Kyle Meyer <kyle@kyleam.com> wrote:\n\n> Change it to \"linkgit\" so that the reference is properly rendered.\n\n>  have `<upstream>` as direct ancestor will keep their original branch point,\n> -i.e. commits that would be excluded by gitlink:git-log[1]'s\n> +i.e. commits that would be excluded by linkgit:git-log[1]'s\n>  `--ancestry-path` option will keep their original ancestry by default. If\n\nHeh, I stumbled on this a few days ago, and have this exact patch in my\nw-i-p series. I found it interesting that both Asciidoctor and AsciiDoc\ntrip on this in quite different ways.\n\nThe patch is correct and tested by me, FWIW.\n\nMartin\n"},{"id":"370492","messageId":"xmqq1s3o4unp.fsf@gitster-ct.c.googlers.com","threadId":"50610","inReplyTo":"CAN0heSo5qsd4t_mgt90ws2hCp3O0qch_9MgXuzj-4FS2gG+bkA@mail.gmail.com","subject":"Re: [PATCH] rebase docs: fix \"gitlink\" typo","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-03-03T01:24:26Z","receivedAt":"2019-03-03T01:24:30Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Martin Ågren <martin.agren@gmail.com> writes:\n\n> On Thu, 28 Feb 2019 at 03:44, Kyle Meyer <kyle@kyleam.com> wrote:\n>\n>> Change it to \"linkgit\" so that the reference is properly rendered.\n>\n>>  have `<upstream>` as direct ancestor will keep their original branch point,\n>> -i.e. commits that would be excluded by gitlink:git-log[1]'s\n>> +i.e. commits that would be excluded by linkgit:git-log[1]'s\n>>  `--ancestry-path` option will keep their original ancestry by default. If\n>\n> Heh, I stumbled on this a few days ago, and have this exact patch in my\n> w-i-p series. I found it interesting that both Asciidoctor and AsciiDoc\n> trip on this in quite different ways.\n>\n> The patch is correct and tested by me, FWIW.\n\nYup, thanks, both.\n"}]}