From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 5 Jun 2015 19:00:20 +0000 (-0700)
Subject: Merge branch 'jk/stripspace-asciidoctor-fix' into maint
X-Git-Tag: v2.4.3~10
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/413a715f18be259243aa7edc7b136f6d7a93ab58?ds=inline;hp=-c

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

413a715f18be259243aa7edc7b136f6d7a93ab58
diff --combined Documentation/git-stripspace.txt
index 6c6e989074,28f787976d..60328d5d08
--- a/Documentation/git-stripspace.txt
+++ b/Documentation/git-stripspace.txt
@@@ -10,7 -10,6 +10,7 @@@ SYNOPSI
  --------
  [verse]
  'git stripspace' [-s | --strip-comments] < input
 +'git stripspace' [-c | --comment-lines] < input
  
  DESCRIPTION
  -----------
@@@ -49,7 -48,7 +49,7 @@@ EXAMPLE
  
  Given the following noisy input with '$' indicating the end of a line:
  
- --------
+ ---------
  |A brief introduction   $
  |   $
  |$
@@@ -65,7 -64,7 +65,7 @@@
  
  Use 'git stripspace' with no arguments to obtain:
  
- --------
+ ---------
  |A brief introduction$
  |$
  |A new paragraph$
@@@ -79,7 -78,7 +79,7 @@@
  
  Use 'git stripspace --strip-comments' to obtain:
  
- --------
+ ---------
  |A brief introduction$
  |$
  |A new paragraph$