Re: [PATCH 5/5] merge-tree: fix link formatting in html docs
- From
Elijah Newren <newren@gmail.com>
- Date
- Feb 17, 2025, 20:30 UTC
- Message-ID
- <CABPp-BEQSsVUPUJyB+SqAsD89NFAzF_ibqOFqrs510kHX0u6xw@mail.gmail.com>
- In-Reply-To
- <89722894c875bc0208945c036700dba74cc0068f.1739723830.git.gitgitgadget@gmail.com>
On Sun, Feb 16, 2025 at 8:37 AM Phillip Wood via GitGitGadget <gitgitgadget@gmail.com> wrote:
Show 28 quoted lines
> > From: Phillip Wood <phillip.wood@dunelm.org.uk> > > In the html documentation the link to the "OUTPUT" section is surrounded > by square brackets. Fix this by adding explicit link text to the cross > reference. > > Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> > --- > Documentation/git-merge-tree.txt | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt > index efb16b4f27d..cf0578f9b5e 100644 > --- a/Documentation/git-merge-tree.txt > +++ b/Documentation/git-merge-tree.txt > @@ -49,7 +49,8 @@ OPTIONS > Do not quote filenames in the <Conflicted file info> section, > and end each filename with a NUL character rather than > newline. Also begin the messages section with a NUL character > - instead of a newline. See <<OUTPUT>> below for more information. > + instead of a newline. See <<OUTPUT,OUTPUT>> below for more > + information. > > --name-only:: > In the Conflicted file info section, instead of writing a list > -- > gitgitgadget
Seems to be the only line in git-merge-tree.txt matching <<.*>> which also matches <<[,]*>>; i.e. looks like the only case that needed to be fixed. Thanks for fixing it.