git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / Atom feed
* [PATCH 0/1] Make the description of git stash save clearer
@ 2019-10-10 10:06 Johannes Schindelin via GitGitGadget
  2019-10-10 10:06 ` [PATCH 1/1] doc(stash): clarify the description of `save` Johannes Schindelin via GitGitGadget
  0 siblings, 1 reply; 4+ messages in thread
From: Johannes Schindelin via GitGitGadget @ 2019-10-10 10:06 UTC (permalink / raw)
  To: git; +Cc: Johannes Schindelin, Junio C Hamano

This is an attempt to revive the discussion started in 
https://public-inbox.org/git/0102016b8d597569-c1f6cfdc-cb45-4428-8737-cb1bc30655d8-000000@eu-west-1.amazonses.com/#t

Johannes Schindelin (1):
  doc(stash): clarify the description of `save`

 Documentation/git-stash.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


base-commit: 70bf0b755af4d1e66da25b7805cac0e481a082e4
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-384%2Fdscho%2Fclarify-stash-doc-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-384/dscho/clarify-stash-doc-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/384
-- 
gitgitgadget

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH 1/1] doc(stash): clarify the description of `save`
  2019-10-10 10:06 [PATCH 0/1] Make the description of git stash save clearer Johannes Schindelin via GitGitGadget
@ 2019-10-10 10:06 ` Johannes Schindelin via GitGitGadget
  2019-10-10 10:28   ` Thomas Gummerer
  0 siblings, 1 reply; 4+ messages in thread
From: Johannes Schindelin via GitGitGadget @ 2019-10-10 10:06 UTC (permalink / raw)
  To: git; +Cc: Johannes Schindelin, Junio C Hamano, Johannes Schindelin

From: Johannes Schindelin <johannes.schindelin@gmx.de>

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-000000@eu-west-1.amazonses.com/#t

Let's rewrite that paragraph for clarity.

Inspired-by-a-patch-by: Catalin Criste <cris_linu_w@yahoo.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 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] [<message>]::
 
 	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 [<options>]::
 
-- 
gitgitgadget

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 1/1] doc(stash): clarify the description of `save`
  2019-10-10 10:06 ` [PATCH 1/1] doc(stash): clarify the description of `save` Johannes Schindelin via GitGitGadget
@ 2019-10-10 10:28   ` Thomas Gummerer
  2019-10-11  5:29     ` Junio C Hamano
  0 siblings, 1 reply; 4+ messages in thread
From: Thomas Gummerer @ 2019-10-10 10:28 UTC (permalink / raw)
  To: Johannes Schindelin via GitGitGadget
  Cc: git, Johannes Schindelin, Junio C Hamano

On 10/10, Johannes Schindelin via GitGitGadget wrote:
> From: Johannes Schindelin <johannes.schindelin@gmx.de>
> 
> 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-000000@eu-west-1.amazonses.com/#t
> 
> Let's rewrite that paragraph for clarity.
> 
> Inspired-by-a-patch-by: Catalin Criste <cris_linu_w@yahoo.com>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

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] [<message>]::
>  
>  	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 [<options>]::
>  
> -- 
> gitgitgadget

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 1/1] doc(stash): clarify the description of `save`
  2019-10-10 10:28   ` Thomas Gummerer
@ 2019-10-11  5:29     ` Junio C Hamano
  0 siblings, 0 replies; 4+ messages in thread
From: Junio C Hamano @ 2019-10-11  5:29 UTC (permalink / raw)
  To: Thomas Gummerer
  Cc: Johannes Schindelin via GitGitGadget, git, Johannes Schindelin

Thomas Gummerer <t.gummerer@gmail.com> writes:

> On 10/10, Johannes Schindelin via GitGitGadget wrote:
>> From: Johannes Schindelin <johannes.schindelin@gmx.de>
>> 
>> 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-000000@eu-west-1.amazonses.com/#t
>> 
>> Let's rewrite that paragraph for clarity.
>> 
>> Inspired-by-a-patch-by: Catalin Criste <cris_linu_w@yahoo.com>
>> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
>
> 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] [<message>]::
>>  
>>  	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 [<options>]::
>>  
>> -- 
>> gitgitgadget

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, back to index

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-10 10:06 [PATCH 0/1] Make the description of git stash save clearer Johannes Schindelin via GitGitGadget
2019-10-10 10:06 ` [PATCH 1/1] doc(stash): clarify the description of `save` Johannes Schindelin via GitGitGadget
2019-10-10 10:28   ` Thomas Gummerer
2019-10-11  5:29     ` Junio C Hamano

git@vger.kernel.org list mirror (unofficial, one of many)

Archives are clonable:
	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

Example config snippet for mirrors

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
	nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git
	nntp://news.gmane.org/gmane.comp.version-control.git

 note: .onion URLs require Tor: https://www.torproject.org/

AGPL code for this site: git clone https://public-inbox.org/ public-inbox