threads / patch / 50610

patchrebase docs: fix "gitlink" typo

Subject: [PATCH] rebase docs: fix "gitlink" typo

## tl;dr

3 messages between Feb 28, 2019 and Mar 3, 2019. Diffs are folded; open one to read it.

replies: 2people: 3as markdown or json

Kyle Meyer· Feb 28, 2019, 02:43 UTC · lore

Change it to "linkgit" so that the reference is properly rendered.

Signed-off-by: Kyle Meyer <kyle@kyleam.com>
---
 Documentation/git-rebase.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to Documentation/git-rebase.txt +1 −1

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 5629ba4c5d..6363d674b7 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -410,7 +410,7 @@ See also INCOMPATIBLE OPTIONS below.
 +
 By default, or when `no-rebase-cousins` was specified, commits which do not
 have `<upstream>` as direct ancestor will keep their original branch point,
-i.e. commits that would be excluded by gitlink:git-log[1]'s
+i.e. commits that would be excluded by linkgit:git-log[1]'s
 `--ancestry-path` option will keep their original ancestry by default. If
 the `rebase-cousins` mode is turned on, such commits are instead rebased
 onto `<upstream>` (or `<onto>`, if specified).

-- 
2.21.0

Martin Ågren· Feb 28, 2019, 09:13 UTC · re: Kyle Meyer · lore

Re: [PATCH] rebase docs: fix "gitlink" typo

On Thu, 28 Feb 2019 at 03:44, Kyle Meyer <kyle@kyleam.com> wrote:

> Change it to "linkgit" so that the reference is properly rendered.

>  have `<upstream>` as direct ancestor will keep their original branch point,
> -i.e. commits that would be excluded by gitlink:git-log[1]'s
> +i.e. commits that would be excluded by linkgit:git-log[1]'s
>  `--ancestry-path` option will keep their original ancestry by default. If

Heh, I stumbled on this a few days ago, and have this exact patch in my w-i-p series. I found it interesting that both Asciidoctor and AsciiDoc trip on this in quite different ways.

The patch is correct and tested by me, FWIW.

Martin

Junio C Hamano· Mar 3, 2019, 01:24 UTC · re: Martin Ågren · lore

Re: [PATCH] rebase docs: fix "gitlink" typo

Martin Ågren <martin.agren@gmail.com> writes:

Show 14 quoted lines

> On Thu, 28 Feb 2019 at 03:44, Kyle Meyer <kyle@kyleam.com> wrote:
>
>> Change it to "linkgit" so that the reference is properly rendered.
>
>>  have `<upstream>` as direct ancestor will keep their original branch point,
>> -i.e. commits that would be excluded by gitlink:git-log[1]'s
>> +i.e. commits that would be excluded by linkgit:git-log[1]'s
>>  `--ancestry-path` option will keep their original ancestry by default. If
>
> Heh, I stumbled on this a few days ago, and have this exact patch in my
> w-i-p series. I found it interesting that both Asciidoctor and AsciiDoc
> trip on this in quite different ways.
>
> The patch is correct and tested by me, FWIW.

Yup, thanks, both.