Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'sh/asciidoc-git-version-fix'
author
Junio C Hamano
<gitster@pobox.com>
Thu, 22 Jan 2015 21:44:47 +0000
(13:44 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 22 Jan 2015 21:44:47 +0000
(13:44 -0800)
* sh/asciidoc-git-version-fix:
Documentation: fix version numbering
Documentation/Makefile
patch
|
blob
|
history
raw
(from parent 1:
ee443cf
)
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