summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-06-05 19:00:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-06-05 19:00:22 (GMT)
commit7c1ff53d5ffb0d16972452ed122849b3fbb1957f (patch)
tree3a54015c5925f956b1a32c32d2a7dc22682bb9f6 /Documentation
parent413a715f18be259243aa7edc7b136f6d7a93ab58 (diff)
parent975e382d13ba9ce98cd58820283464b6aaefbad1 (diff)
downloadgit-7c1ff53d5ffb0d16972452ed122849b3fbb1957f.zip
git-7c1ff53d5ffb0d16972452ed122849b3fbb1957f.tar.gz
git-7c1ff53d5ffb0d16972452ed122849b3fbb1957f.tar.bz2
Merge branch 'ja/tutorial-asciidoctor-fix' into maint
A literal block in the tutorial had lines with unequal lengths to delimit it from the rest of the document, which choke GitHub's AsciiDoc renderer. * ja/tutorial-asciidoctor-fix: doc: fix unmatched code fences
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/gitcore-tutorial.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/gitcore-tutorial.txt b/Documentation/gitcore-tutorial.txt
index 8475c07..36e9ab3 100644
--- a/Documentation/gitcore-tutorial.txt
+++ b/Documentation/gitcore-tutorial.txt
@@ -259,7 +259,7 @@ index 557db03..263414f 100644
@@ -1 +1,2 @@
Hello World
+It's a new day for git
-----
+------------
i.e. the diff of the change we caused by adding another line to `hello`.