From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 22 May 2015 19:41:48 +0000 (-0700)
Subject: Merge branch 'ja/tutorial-asciidoctor-fix'
X-Git-Tag: v2.5.0-rc0~94
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/236794f1eb85da0dbc83389ebe509476b0c8769e?ds=inline;hp=-c

Merge branch 'ja/tutorial-asciidoctor-fix'

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
---

236794f1eb85da0dbc83389ebe509476b0c8769e
diff --combined Documentation/gitcore-tutorial.txt
index 8475c07932,385a4b1012..36e9ab3e16
--- a/Documentation/gitcore-tutorial.txt
+++ b/Documentation/gitcore-tutorial.txt
@@@ -259,7 -259,7 +259,7 @@@ index 557db03..263414f 10064
  @@ -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`.
  
@@@ -1667,7 -1667,7 +1667,7 @@@ linkgit:gittutorial[7]
  linkgit:gittutorial-2[7],
  linkgit:gitcvs-migration[7],
  linkgit:git-help[1],
 -link:everyday.html[Everyday git],
 +linkgit:giteveryday[7],
  link:user-manual.html[The Git User's Manual]
  
  GIT