diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-24 15:29:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-24 15:29:35 -0700 |
| commit | 74567ac0018247cbe08a5c1a1b1176a51ec2e49e (patch) | |
| tree | bcc221dfaa8fed9d0119024493862946d27dfb87 /Documentation/pretty-formats.txt | |
| parent | 77bcac3e72430472853602603a395f6edbbc5112 (diff) | |
| parent | 8abc09c0e38659bb438475eca768a035ed8d85b9 (diff) | |
| download | git-74567ac0018247cbe08a5c1a1b1176a51ec2e49e.tar.gz | |
Merge branch 'sg/doc-pretty-formats' into maint
Doc update.
* sg/doc-pretty-formats:
docs/pretty-formats: stress that %- removes all preceding line-feeds
Diffstat (limited to 'Documentation/pretty-formats.txt')
| -rw-r--r-- | Documentation/pretty-formats.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt index 38040e95b5..a48d267e26 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 |