* [PATCH] rebase docs: fix "gitlink" typo
@ 2019-02-28 2:43 Kyle Meyer
2019-02-28 9:13 ` Martin Ågren
0 siblings, 1 reply; 3+ messages in thread
From: Kyle Meyer @ 2019-02-28 2:43 UTC (permalink / raw)
To: git; +Cc: Kyle Meyer
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(-)
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] rebase docs: fix "gitlink" typo
2019-02-28 2:43 [PATCH] rebase docs: fix "gitlink" typo Kyle Meyer
@ 2019-02-28 9:13 ` Martin Ågren
2019-03-03 1:24 ` Junio C Hamano
0 siblings, 1 reply; 3+ messages in thread
From: Martin Ågren @ 2019-02-28 9:13 UTC (permalink / raw)
To: Kyle Meyer; +Cc: Git Mailing List
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] rebase docs: fix "gitlink" typo
2019-02-28 9:13 ` Martin Ågren
@ 2019-03-03 1:24 ` Junio C Hamano
0 siblings, 0 replies; 3+ messages in thread
From: Junio C Hamano @ 2019-03-03 1:24 UTC (permalink / raw)
To: Martin Ågren; +Cc: Kyle Meyer, Git Mailing List
Martin Ågren <martin.agren@gmail.com> writes:
> 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.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-03-03 1:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-02-28 2:43 [PATCH] rebase docs: fix "gitlink" typo Kyle Meyer
2019-02-28 9:13 ` Martin Ågren
2019-03-03 1:24 ` Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).