diff options
| -rw-r--r-- | Documentation/Makefile | 2 | ||||
| -rwxr-xr-x | t/t3301-notes.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile index 2f6b6aabd7..3e39e2815b 100644 --- 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 diff --git a/t/t3301-notes.sh b/t/t3301-notes.sh index 245406ab97..8cffd35fb0 100755 --- a/t/t3301-notes.sh +++ b/t/t3301-notes.sh @@ -658,7 +658,7 @@ test_expect_success '--show-notes=* adds to GIT_NOTES_DISPLAY_REF' ' ' test_expect_success '--no-standard-notes' ' - cat >expect-commits <<EOF + cat >expect-commits <<-EOF && commit 2c125331118caba0ff8238b7f4958ac6e93fe39c Author: A U Thor <author@example.com> Date: Thu Apr 7 15:18:13 2005 -0700 |