Thread (1 message) 1 message, 1 author, 2016-06-15

Re: a475e8095aeb898c1ca60673b82df97d2300cc95 broken for docs

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:43:30
Subsystem: documentation, the rest · Maintainers: Jonathan Corbet, Linus Torvalds

Possibly related (same subject, not in this thread)

Thanks.  One difference we overlooked was the differences in
versions of AsciiDoc; Quy sees problem with 8 while I do not
with 7 (both my private machine and k.org machine -- the latter
of which is where preformatted documentation pages in html and
man branches come from).  I think Shawn was correct to pinpoint
that exact change as the culprit and Quy Tonthat is on the right
track, with this patch...



diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt
index cbbc234..a0c611e 100644
--- a/Documentation/git-rev-list.txt
+++ b/Documentation/git-rev-list.txt
@@ -298,8 +298,8 @@ used in the output.  When the starting commit is specified as
 'commit@{now}', output also uses 'commit@\{timestamp}' notation
 instead.  Under '\--pretty=oneline', the commit message is
 prefixed with this information on the same line.
-+
-Cannot be combined with --reverse.
+
+Cannot be combined with '\--reverse'.
 
 --merge::
 
@@ -375,7 +375,7 @@ By default, the commits are shown in reverse chronological order.
 --reverse::
 
 	Output the commits in reverse order.
-	Cannot be combined with --walk-reflogs.
+	Cannot be combined with '\--walk-reflogs'.
 
 Object Traversal
 ~~~~~~~~~~~~~~~~
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help