git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] doc: fix the 'revert a faulty merge' ASCII art tab spacing

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Oct 25, 2016, 11:39 UTC
Message-ID
<alpine.DEB.2.20.1610251338520.3264@virtualbox>
In-Reply-To
<20161024215432.1384-1-philipoakley@iee.org>
Hi Philip,
On Mon, 24 Oct 2016, Philip Oakley wrote:
Show 14 quoted lines
> The asciidoctor doc-tool stack does not always respect the 'tab = 8 spaces' rule
> expectation, particularly for the Git-for-Windows generated html pages. This
> follows on from the 'doc: fix merge-base ASCII art tab spacing' fix.
> 
> Use just spaces within the block of the ascii art.
> 
> All other *.txt ascii art containing three dashes has been checked.
> Asciidoctor correctly formats the other art blocks that do contain tabs.
> 
> Signed-off-by: Philip Oakley <philipoakley@iee.org
> ---
> The git-scm doc pages https://git-scm.com/docs/ does not convert this
> how-to document to html, rather it links to the Github text pages, which
> does respect the 8 space tab rule.

I confirm that this fixes the misaligned branches when building the documentation with asciidoctor 1.5.4 in Git for Windows' SDK.

Ciao, Dscho

Previous: Philip OakleyNext: Jeff King
Message 9 of 10 in “doc: fix merge-base ASCII art tab spacing”
  1. doc: fix merge-base ASCII art tab spacingPhilip Oakley, Oct 20, 2016
  2. Jeff KingOct 21, 2016
  3. Junio C HamanoOct 21, 2016
  4. Junio C HamanoOct 21, 2016
  5. Philip OakleyOct 21, 2016
  6. Junio C HamanoOct 21, 2016
  7. Philip OakleyOct 22, 2016
  8. doc: fix the 'revert a faulty merge' ASCII art tab spacingPhilip Oakley, Oct 24, 2016
  9. Johannes SchindelinOct 25, 2016
  10. Jeff KingOct 22, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.