summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-10-29 17:35:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-10-29 17:35:10 (GMT)
commit27c31d2088a14e6d2f6a83cf24fdcc90aa936e6b (patch)
tree8e62ede347d05c0563051e682a7c46af13830722 /Documentation
parenta8f01f87d03bef31d3b7f43c4c46398ec76a8e91 (diff)
parentc30c43c07dc2f53d7a1b247813597e087313a518 (diff)
downloadgit-27c31d2088a14e6d2f6a83cf24fdcc90aa936e6b.zip
git-27c31d2088a14e6d2f6a83cf24fdcc90aa936e6b.tar.gz
git-27c31d2088a14e6d2f6a83cf24fdcc90aa936e6b.tar.bz2
Merge branch 'bc/asciidoc-pretty-formats-fix' into maint
* bc/asciidoc-pretty-formats-fix: Documentation: fix misrender of pretty-formats in Asciidoctor
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/pretty-formats.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index 85d6353..b87784d 100644
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@ -95,7 +95,7 @@ would show something like this:
The author of fe6e0ee was Junio C Hamano, 23 hours ago
The title was >>t4119: test autocomputing -p<n> for traditional diff input.<<
---------
+-------
+
The placeholders are: