Re: [PATCH] escape tilde in Documentation/git-rev-parse.txt
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:42:42
Stefan Richter [off-list ref] writes:
quoted hunk
fixes a failure to build the git-rev-parse manpage, seen with asciidoc 8.0.0 Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> ---diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt index b761b4b..671b4e3 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 '~<n>' to a revision parameter means the commit +* A suffix '$$~$$<n>' to a revision parameter means the commit object that is the <n>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\
But this makes it asciidoc 7.1 barf, so we need an alternative compatible to both. This works for me on 7.1; is your 8.0 happy with it? -- >8 --
diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf
index 8196d78..44b1ce4 100644
--- a/Documentation/asciidoc.conf
+++ b/Documentation/asciidoc.conf@@ -11,6 +11,7 @@ # the command. caret=^ startsb=[ endsb=] +tilde=~ ifdef::backend-docbook[] [gitlink-inlinemacro]
diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
index b761b4b..2f1306c 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 '~<n>' to a revision parameter means the commit +* A suffix '{tilde}<n>' to a revision parameter means the commit object that is the <n>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\