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

[PATCH] Documentation/git-merge-file.txt: make asciidoc not complain

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Dec 17, 2006, 14:48 UTC
Message-ID
<Pine.LNX.4.63.0612171546180.3635@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To
<4584857D.703@gmail.com>

Noticed by Randal L. Schwartz, this is a fix proposed by A Large Angry SCM.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
---
	On Sat, 16 Dec 2006, A Large Angry SCM wrote:
	> Randal L. Schwartz wrote:
	> > asciidoc -b xhtml11 -d manpage -f asciidoc.conf git-merge-file.txt
	> > ERROR: manpage document title is mandatory
	> > ERROR: git-merge-file.txt: line 3: title not permitted in sidebar body
	> > [...]
	> > make[1]: *** [git-merge-file.html] Error 1
	> > make: *** [doc] Error 2
	> 
	> Add 5 "=" to line 2.
	... which this patch does. This time, it is asciidoc-tested, too.
 Documentation/git-merge-file.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/git-merge-file.txt b/Documentation/git-merge-file.txt
index 0b41d66..09fe24f 100644
--- a/Documentation/git-merge-file.txt
+++ b/Documentation/git-merge-file.txt
@@ -1,5 +1,5 @@
 git-merge-file(1)
-============
+=================
 
 NAME
 ----
-- 
1.4.4.2.ga4be2-dirty
Previous: Randal L. Schwartz
Message 5 of 5 in “[BUG] making docs blows up in b1bfcae438ad:git-merge-file.txt”
  1. Randal L. SchwartzDec 16, 2006
  2. A Large Angry SCMDec 16, 2006
  3. The Answering MachineDec 16, 2006
  4. Randal L. SchwartzDec 17, 2006
  5. Documentation/git-merge-file.txt: make asciidoc not complainJohannes Schindelin, Dec 17, 2006

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.