[PATCH] doc: fix form -> from typo

[PATCH] doc: fix form -> from typo

[Catalin Criste]

Signed-off-by: Catalin Criste <cris_linu_w@yahoo.com>
---
 Documentation/git-stash.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index 7ef8c4791177b..b96ce2d02d149 100644
--- a/Documentation/git-stash.txt
+++ b/Documentation/git-stash.txt
@@ -88,7 +88,7 @@ save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q
 
 	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.
+	and any non-option arguments from the message.
 
 list [<options>]::
 

--
https://github.com/git/git/pull/521

Re: [PATCH] doc: fix form -> from typo

[Martin Ågren]

Hi Catalin

Welcome to the list!

On Tue, 25 Jun 2019 at 09:43, Catalin Criste <cris_linu_w@yahoo.com> wrote:

> @@ -88,7 +88,7 @@ save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q
>
>         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.
> +       and any non-option arguments from the message.

I think this is actually intended as "form". It took me a couple of
readings, but what this paragraph wants to say is that any non-option
arguments will be used to form (construct) the message.

Do you have any suggestions as to how this could be made clearer?
There are at least two of us that have stumbled on this. :-)

Cheers
Martin

Re: [PATCH] doc: fix form -> from typo

[Johannes Schindelin]

[-- Attachment #1: Type: text/plain, Size: 1178 bytes --]

Hi Martin,

On Tue, 25 Jun 2019, Martin Ågren wrote:

> On Tue, 25 Jun 2019 at 09:43, Catalin Criste <cris_linu_w@yahoo.com> wrote:
>
> > @@ -88,7 +88,7 @@ save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q
> >
> >         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.
> > +       and any non-option arguments from the message.
>
> I think this is actually intended as "form". It took me a couple of
> readings, but what this paragraph wants to say is that any non-option
> arguments will be used to form (construct) the message.

You're right! I totally misread this, too.

> Do you have any suggestions as to how this could be made clearer?
> There are at least two of us that have stumbled on this. :-)

Make that three.

Maybe something like

	This option is deprecated in favour of 'git stash push'.  It
	differs from "stash push" in that it cannot take pathspecs;
	Instead, all non-option arguments are concatenated to form the stash
	message.

?

Ciao,
Dscho

Re: [PATCH] doc: fix form -> from typo

[Martin Ågren]

On Tue, 25 Jun 2019 at 13:40, Johannes Schindelin
<Johannes.Schindelin@gmx.de> wrote:
> On Tue, 25 Jun 2019, Martin Ågren wrote:

> > Do you have any suggestions as to how this could be made clearer?
> > There are at least two of us that have stumbled on this. :-)
>
> Make that three.
>
> Maybe something like
>
>         This option is deprecated in favour of 'git stash push'.  It
>         differs from "stash push" in that it cannot take pathspecs;
>         Instead, all non-option arguments are concatenated to form the stash
>         message.
>
> ?

Looks good. I would probably avoid the semicolon ";" and in this case
just replace it with a period. But it's nothing I feel strongly about.

Martin

Re: [PATCH] doc: fix form -> from typo

[Junio C Hamano]

Martin Ågren <martin.agren@gmail.com> writes:

> Hi Catalin
>
> Welcome to the list!
>
> On Tue, 25 Jun 2019 at 09:43, Catalin Criste <cris_linu_w@yahoo.com> wrote:
>
>> @@ -88,7 +88,7 @@ save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q
>>
>>         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.
>> +       and any non-option arguments from the message.
>
> I think this is actually intended as "form". It took me a couple of
> readings, but what this paragraph wants to say is that any non-option
> arguments will be used to form (construct) the message.
>
> Do you have any suggestions as to how this could be made clearer?
> There are at least two of us that have stumbled on this. :-)

"become"?

Re: [PATCH] doc: fix form -> from typo

[Thomas Gummerer]

On 06/25, Martin Ågren wrote:
> Hi Catalin
> 
> Welcome to the list!
> 
> On Tue, 25 Jun 2019 at 09:43, Catalin Criste <cris_linu_w@yahoo.com> wrote:
> 
> > @@ -88,7 +88,7 @@ save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q
> >
> >         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.
> > +       and any non-option arguments from the message.
> 
> I think this is actually intended as "form". It took me a couple of
> readings, but what this paragraph wants to say is that any non-option
> arguments will be used to form (construct) the message.
> 
> Do you have any suggestions as to how this could be made clearer?
> There are at least two of us that have stumbled on this. :-)

Even though I originally wrote this I had to have a double take on it.
Maybe what you're saying above would be good?  "and any non-option
arguments are used to form the message" sounds a little clearer to
me.  Or maybe even use the word construct?  Dunno.