From: Junio C Hamano <gitster@pobox.com>
To: Thomas Gummerer <t.gummerer@gmail.com>
Cc: Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: [PATCH 1/1] doc(stash): clarify the description of `save`
Date: Fri, 11 Oct 2019 14:29:59 +0900 [thread overview]
Message-ID: <xmqq36fzj1d4.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20191010102828.GA12497@cat> (Thomas Gummerer's message of "Thu, 10 Oct 2019 11:28:28 +0100")
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
prev parent reply other threads:[~2019-10-11 5:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq36fzj1d4.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=johannes.schindelin@gmx.de \
--cc=t.gummerer@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).