threads / patch / 46186

patchdocs/pretty-formats: stress that %- removes all preceding line-feeds

Subject: [PATCH] docs/pretty-formats: stress that %- removes all preceding line-feeds

## tl;dr

2 messages between Jun 15, 2017 and Jun 16, 2017. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

SZEDER Gábor· Jun 15, 2017, 10:36 UTC · lore

Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
---

A mere plural "line-feeds" was too subtle for me to grasp on first (and second...) reading.

 Documentation/pretty-formats.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Show changes to Documentation/pretty-formats.txt +2 −2

diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index 38040e95b..a48d267e2 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

-- 
2.13.1.505.g7cc9fcafb

Jonathan Nieder· Jun 16, 2017, 18:30 UTC · re: SZEDER Gábor · lore

Re: [PATCH] docs/pretty-formats: stress that %- removes all preceding line-feeds

SZEDER Gábor wrote:

> Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
> ---
> A mere plural "line-feeds" was too subtle for me to grasp on first
> (and second...) reading.

This could go in the commit message.

>  Documentation/pretty-formats.txt | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

With or without such a tweak,
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>

Thanks.

Show 15 quoted lines

> diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
> index 38040e95b..a48d267e2 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