summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-06-05 19:00:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-06-05 19:00:21 (GMT)
commit413a715f18be259243aa7edc7b136f6d7a93ab58 (patch)
tree9ccde87b8c191267ee170f12d14c6fd10d1ef550 /Documentation
parent96b7f93ac85ba09aaa82ecc86bf14cba481bbdbb (diff)
parentad3967a5a2bc8a2505ba618e59cd541775571ff8 (diff)
downloadgit-413a715f18be259243aa7edc7b136f6d7a93ab58.zip
git-413a715f18be259243aa7edc7b136f6d7a93ab58.tar.gz
git-413a715f18be259243aa7edc7b136f6d7a93ab58.tar.bz2
Merge branch 'jk/stripspace-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. * jk/stripspace-asciidoctor-fix: doc: fix unmatched code fences in git-stripspace
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-stripspace.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-stripspace.txt b/Documentation/git-stripspace.txt
index 6c6e989..60328d5 100644
--- a/Documentation/git-stripspace.txt
+++ b/Documentation/git-stripspace.txt
@@ -49,7 +49,7 @@ EXAMPLES
Given the following noisy input with '$' indicating the end of a line:
---------
+---------
|A brief introduction $
| $
|$
@@ -65,7 +65,7 @@ Given the following noisy input with '$' indicating the end of a line:
Use 'git stripspace' with no arguments to obtain:
---------
+---------
|A brief introduction$
|$
|A new paragraph$
@@ -79,7 +79,7 @@ Use 'git stripspace' with no arguments to obtain:
Use 'git stripspace --strip-comments' to obtain:
---------
+---------
|A brief introduction$
|$
|A new paragraph$