summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-10-14 17:50:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-10-14 17:50:21 (GMT)
commit337233c5021745b802bb4b9e862a1fe89ffc0527 (patch)
tree6af3cec47b43c79f62432c22bfd1eb633f715201
parent0189df3161986643565f12418a8c64edbc42de2e (diff)
parentc30c43c07dc2f53d7a1b247813597e087313a518 (diff)
downloadgit-337233c5021745b802bb4b9e862a1fe89ffc0527.zip
git-337233c5021745b802bb4b9e862a1fe89ffc0527.tar.gz
git-337233c5021745b802bb4b9e862a1fe89ffc0527.tar.bz2
Merge branch 'bc/asciidoc-pretty-formats-fix'
* bc/asciidoc-pretty-formats-fix: Documentation: fix misrender of pretty-formats in Asciidoctor
-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 eecc39d..dcf7429 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: