From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 24 Jun 2017 22:29:35 +0000 (-0700)
Subject: Merge branch 'sg/doc-pretty-formats' into maint
X-Git-Tag: v2.13.2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/74567ac0018247cbe08a5c1a1b1176a51ec2e49e?ds=inline;hp=-c

Merge branch 'sg/doc-pretty-formats' into maint

Doc update.

* sg/doc-pretty-formats:
docs/pretty-formats: stress that %- removes all preceding line-feeds
---

74567ac0018247cbe08a5c1a1b1176a51ec2e49e
diff --combined Documentation/pretty-formats.txt
index 38040e95b5,32533b8980..a48d267e26
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@@ -199,7 -199,7 +199,7 @@@ endif::git-rev-list[
    than given and there are spaces on its left, use those spaces
  - '%><(<N>)', '%><|(<N>)': similar to '% <(<N>)', '%<|(<N>)'
    respectively, but padding both sides (i.e. the text is centered)
 --%(trailers): display the trailers of the body as interpreted by
 +- %(trailers): display the trailers of the body as interpreted by
    linkgit:git-interpret-trailers[1]
  
  NOTE: Some placeholders may depend on other options given to the
@@@ -213,8 -213,8 +213,8 @@@ If you add a `+` (plus sign) after '%' 
  is inserted immediately before the expansion if and only if the
  placeholder expands to a non-empty string.
  
- If you add a `-` (minus sign) after '%' of a placeholder, line-feeds that
- immediately precede the expansion are deleted if and only if the
+ If you add a `-` (minus sign) after '%' of a placeholder, all consecutive
+ line-feeds immediately preceding the expansion are deleted if and only if the
  placeholder expands to an empty string.
  
  If you add a ` ` (space) after '%' of a placeholder, a space