Re: [PATCH 1/1] doc(stash): clarify the description of `save`

2019-10-10 Thread Junio C Hamano
Thomas Gummerer  writes:

> On 10/10, Johannes Schindelin via GitGitGadget wrote:
>> From: Johannes Schindelin 
>> 
>> The original phrasing of this paragraph made at least one person stumble
>> over the word "from" (thinking that it was a typo and "from" was
>> intended), and other readers chimed in, agreeing that it was confusing:
>> https://public-inbox.org/git/0102016b8d597569-c1f6cfdc-cb45-4428-8737-cb1bc30655d8-000...@eu-west-1.amazonses.com/#t
>> 
>> Let's rewrite that paragraph for clarity.
>> 
>> Inspired-by-a-patch-by: Catalin Criste 
>> Signed-off-by: Johannes Schindelin 
>
> Thanks for picking this thread up again, I had already forgotten about
> it.  The updated wording sounds like an improvement to me.

To me too.  I would have just done s/form/become/ out of laziness
and aiming for conciseness, but the new and separate sentence is
good, too.

Thanks, both.

>
>> ---
>>  Documentation/git-stash.txt | 5 +++--
>>  1 file changed, 3 insertions(+), 2 deletions(-)
>> 
>> diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
>> index 8fbe12c66c..53e1a1205d 100644
>> --- a/Documentation/git-stash.txt
>> +++ b/Documentation/git-stash.txt
>> @@ -87,8 +87,9 @@ The `--patch` option implies `--keep-index`.  You can use
>>  save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] 
>> [-a|--all] [-q|--quiet] []::
>>  
>>  This option is deprecated in favour of 'git stash push'.  It
>> -differs from "stash push" in that it cannot take pathspecs,
>> -and any non-option arguments form the message.
>> +differs from "stash push" in that it cannot take pathspecs.
>> +Instead, all non-option arguments are concatenated to form the stash
>> +message.
>>  
>>  list []::
>>  
>> -- 
>> gitgitgadget


Re: [PATCH 1/1] doc(stash): clarify the description of `save`

2019-10-10 Thread Thomas Gummerer
On 10/10, Johannes Schindelin via GitGitGadget wrote:
> From: Johannes Schindelin 
> 
> The original phrasing of this paragraph made at least one person stumble
> over the word "from" (thinking that it was a typo and "from" was
> intended), and other readers chimed in, agreeing that it was confusing:
> https://public-inbox.org/git/0102016b8d597569-c1f6cfdc-cb45-4428-8737-cb1bc30655d8-000...@eu-west-1.amazonses.com/#t
> 
> Let's rewrite that paragraph for clarity.
> 
> Inspired-by-a-patch-by: Catalin Criste 
> Signed-off-by: Johannes Schindelin 

Thanks for picking this thread up again, I had already forgotten about
it.  The updated wording sounds like an improvement to me.

> ---
>  Documentation/git-stash.txt | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
> index 8fbe12c66c..53e1a1205d 100644
> --- a/Documentation/git-stash.txt
> +++ b/Documentation/git-stash.txt
> @@ -87,8 +87,9 @@ The `--patch` option implies `--keep-index`.  You can use
>  save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] 
> [-q|--quiet] []::
>  
>   This option is deprecated in favour of 'git stash push'.  It
> - differs from "stash push" in that it cannot take pathspecs,
> - and any non-option arguments form the message.
> + differs from "stash push" in that it cannot take pathspecs.
> + Instead, all non-option arguments are concatenated to form the stash
> + message.
>  
>  list []::
>  
> -- 
> gitgitgadget