git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "Martin Ågren" <martin.agren@gmail.com>
Cc: git@vger.kernel.org, Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH] gitworkflows.txt: fix broken subsection underline
Date: Sat, 18 Jul 2020 13:41:55 -0700	[thread overview]
Message-ID: <xmqq1rl8blnw.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20200718201723.10889-1-martin.agren@gmail.com> ("Martin Ågren"'s message of "Sat, 18 Jul 2020 22:17:23 +0200")

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

> AsciiDoctor renders the "~~~~~~~~~" literally. That's not our intention:
> it is supposed to indicate a level 2 subsection. In 828197de8f ("docs:
> adjust for the recent rename of `pu` to `seen`", 2020-06-25), the length
> of this section header grew by two characters but we didn't adjust the
> number of ~ characters accordingly. AsciiDoc handles this discrepancy ok
> and still picks this up as a subsection title, but Asciidoctor is not as
> forgiving.
>
> Signed-off-by: Martin Ågren <martin.agren@gmail.com>
> ---
>  Documentation/gitworkflows.txt | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Nicely spotted and this obviously want to be in the final release,
as it comes from 828197de (docs: adjust for the recent rename of
`pu` to `seen`, 2020-06-25), which is a post 2.27 development.

Thanks.

>
> diff --git a/Documentation/gitworkflows.txt b/Documentation/gitworkflows.txt
> index 2db7ba7842..47cf97f9be 100644
> --- a/Documentation/gitworkflows.txt
> +++ b/Documentation/gitworkflows.txt
> @@ -292,7 +292,7 @@ described in the previous section.
>  
>  
>  Branch management for next and seen after a feature release
> -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>  
>  After a feature release, the integration branch 'next' may optionally be
>  rewound and rebuilt from the tip of 'master' using the surviving

  reply	other threads:[~2020-07-18 20:42 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-18 20:17 [PATCH] gitworkflows.txt: fix broken subsection underline Martin Ågren
2020-07-18 20:41 ` Junio C Hamano [this message]
2020-08-10 14:18 ` Johannes Schindelin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqq1rl8blnw.fsf@gitster.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=martin.agren@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).