Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf
index baefb2f0daccf65dbb1bfc5724c508b9be4468ec..fa0877d483b18181bd234ba5e7d600ab7e4a184d 100644 (file)
--- a/Documentation/asciidoc.conf
+++ b/Documentation/asciidoc.conf
@@ -7,6 +7,9 @@
 # Show GIT link as: <command>(<section>); if section is defined, else just show
 # the command.
 
+[attributes]
+caret=^
+
 ifdef::backend-docbook[]
 [gitlink-inlinemacro]
 {0%{target}}
@@ -19,3 +22,5 @@ ifdef::backend-xhtml11[]
 [gitlink-inlinemacro]
 <a href="{target}.html">{target}{0?({0})}</a>
 endif::backend-xhtml11[]
+
+