Skip to contentSkip to conversation

rebase docs: fix "gitlink" typo

PATCH In review Kyle Meyer 3 participants 3 messages Feb 28, 2019 – Mar 3, 2019 Documentation

lore
Share & tools
lore

Kyle Meyer

author
#0 lore raw

PATCH 1/1 rebase docs: fix "gitlink" typo

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

---
 Documentation/git-rebase.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/git-rebase.txt +1 -1
index 5629ba4c5d..6363d674b7 100644
@@ -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).
Signature · 1 line
2.21.0
#1 lore raw

Documentation/git-rebase.txt See also INCOMPATIBLE OPTIONS below. · line 414

Quoted 6 lines · Kyle Meyer

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

have <upstream> as direct ancestor will keep their original branch point,

Documentation/git-rebase.txt +1 -1
-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

#2 lore raw
Quoted 13 lines · Martin Ågren

Documentation/git-rebase.txt See also INCOMPATIBLE OPTIONS below. · line 414

Quoted 6 lines · Kyle Meyer

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

have <upstream> as direct ancestor will keep their original branch point,

Documentation/git-rebase.txt +1 -1
-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.

Quoted 1 line

The patch is correct and tested by me, FWIW.

Yup, thanks, both.