Merge branch 'jn/rerere-fail-on-auto-update-failure' into maint

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 2f6b6aabd74a24abdb3ac189118095fcee19f8d2..3e39e2815baca82fe5f1fff8791de37c3c7247ac 100644 (file)
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -103,7 +103,7 @@ ASCIIDOC_HTML = xhtml11
 ASCIIDOC_DOCBOOK = docbook
 ASCIIDOC_CONF = -f asciidoc.conf
 ASCIIDOC_COMMON = $(ASCIIDOC) $(ASCIIDOC_EXTRA) $(ASCIIDOC_CONF) \
-               -agit-version=$(GIT_VERSION)
+               -agit_version=$(GIT_VERSION)
 TXT_TO_HTML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_HTML)
 TXT_TO_XML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_DOCBOOK)
 MANPAGE_XSL = manpage-normal.xsl