From: Junio C Hamano Date: Tue, 3 Oct 2006 05:52:57 +0000 (-0700) Subject: escape tilde in Documentation/git-rev-parse.txt X-Git-Tag: v1.4.3-rc2~26 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=54bd25580e227c15a5f1a2b01be794b65e434665;p=git.git escape tilde in Documentation/git-rev-parse.txt Fixes a failure to build the git-rev-parse manpage, seen with asciidoc 8.0.0 We would love to use nicer quoting $$~$$ but alas asciidoc 7 does not know about it. So use asciidoc.conf and define {tilde} to be ~. Signed-off-by: Junio C Hamano Acked-by: Stefan Richter --- diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf index 8196d787a..44b1ce4c6 100644 --- a/Documentation/asciidoc.conf +++ b/Documentation/asciidoc.conf @@ -11,6 +11,7 @@ caret=^ startsb=[ endsb=] +tilde=~ ifdef::backend-docbook[] [gitlink-inlinemacro] diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt index b761b4b96..2f1306c1d 100644 --- a/Documentation/git-rev-parse.txt +++ b/Documentation/git-rev-parse.txt @@ -138,7 +138,7 @@ syntax. 'rev{caret}0' means the commit itself and is used when 'rev' is the object name of a tag object that refers to a commit object. -* A suffix '~' to a revision parameter means the commit +* A suffix '{tilde}' to a revision parameter means the commit object that is the th generation grand-parent of the named commit object, following only the first parent. I.e. rev~3 is equivalent to rev{caret}{caret}{caret} which is equivalent to\