Merge branch 'sg/doc-pretty-formats' into maint
Doc update.
* sg/doc-pretty-formats:
docs/pretty-formats: stress that %- removes all preceding line-feeds
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 @@
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