summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-06-24 21:28:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-06-24 21:28:39 (GMT)
commitf3c9c8501d86de88f8ec88a6d520e7e3aea5cead (patch)
tree6c8364db6af12b44b91eacfdccdbf0719d914523
parent8af3c643d9c042d806a17fe706470a8c1acee231 (diff)
parent8abc09c0e38659bb438475eca768a035ed8d85b9 (diff)
downloadgit-f3c9c8501d86de88f8ec88a6d520e7e3aea5cead.zip
git-f3c9c8501d86de88f8ec88a6d520e7e3aea5cead.tar.gz
git-f3c9c8501d86de88f8ec88a6d520e7e3aea5cead.tar.bz2
Merge branch 'sg/doc-pretty-formats'
Doc update. * sg/doc-pretty-formats: docs/pretty-formats: stress that %- removes all preceding line-feeds
-rw-r--r--Documentation/pretty-formats.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index 38040e9..a48d267 100644
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@ -213,8 +213,8 @@ If you add a `+` (plus sign) after '%' of a placeholder, a line-feed
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