| Message ID | 20190228024315.1470303-1-kyle@kyleam.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | rebase docs: fix "gitlink" typo | expand |
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
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.
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).
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(-)