[PATCH] Fix grammar in git push man page

[PATCH] Fix grammar in git push man page

[Wesley Schwengle]

While working on a blog post and using grammarly it suggested these two
changes.

Signed-off-by: Wesley Schwengle <wesleys@opperschaap.net>
---
 Documentation/git-push.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index 297927d866..6926e79719 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -37,7 +37,7 @@ the default `<refspec>` by consulting `remote.*.push` configuration,
 and if it is not found, honors `push.default` configuration to decide
 what to push (See linkgit:git-config[1] for the meaning of `push.default`).
 
-When neither the command-line nor the configuration specify what to
+When neither the command line nor the configuration specifies what to
 push, the default behavior is used, which corresponds to the `simple`
 value for `push.default`: the current branch is pushed to the
 corresponding upstream branch, but as a safety measure, the push is
-- 
2.42.0.rc0.26.ga73c38ecaa

Re: [PATCH] Fix grammar in git push man page

[Junio C Hamano]

Wesley Schwengle <wesleys@opperschaap.net> writes:

> Subject: Re: [PATCH] Fix grammar in git push man page

We would probably phrase it more like

	Subject: git-push.txt: fix grammar

> While working on a blog post and using grammarly it suggested these two
> changes.
>
> Signed-off-by: Wesley Schwengle <wesleys@opperschaap.net>
> ---
>  Documentation/git-push.txt | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
> index 297927d866..6926e79719 100644
> --- a/Documentation/git-push.txt
> +++ b/Documentation/git-push.txt
> @@ -37,7 +37,7 @@ the default `<refspec>` by consulting `remote.*.push` configuration,
>  and if it is not found, honors `push.default` configuration to decide
>  what to push (See linkgit:git-config[1] for the meaning of `push.default`).
>  
> -When neither the command-line nor the configuration specify what to
> +When neither the command line nor the configuration specifies what to

The fix for the verb is very much correct and appreciated.

The first part is debatable for two reasons.

Locally, what is "fixed" is only one of the two instances of
"command-line" in this file.  If we were to clean it up, you would
at least want to do the other one for consistency.

Globally, git grep -i "command.line" in Documentation (excluding
Documentation/RelNotes, as that part is almost exclusively written
by me and shows my bias) gives ~200 hits for "command line" and ~100
hits for "command-line".  We pretty much use them inter-changeably,
in other words.

But for the grammar fix, it probably makes sense to just fix the
verb without touching "command-line"; you have ~100 other instances
that want to be touched for consistency, and they shouldn't take the
verb fix hostage.

Thanks.

>  push, the default behavior is used, which corresponds to the `simple`
>  value for `push.default`: the current branch is pushed to the
>  corresponding upstream branch, but as a safety measure, the push is

[[PATCH v2]] git-push.txt: fix grammar

[Wesley Schwengle]

While working on a blog post and using grammarly it suggested this
change.

Signed-off-by: Wesley Schwengle <wesleys@opperschaap.net>
---
 Documentation/git-push.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index 297927d866..5b4edaf4a8 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -37,7 +37,7 @@ the default `<refspec>` by consulting `remote.*.push` configuration,
 and if it is not found, honors `push.default` configuration to decide
 what to push (See linkgit:git-config[1] for the meaning of `push.default`).
 
-When neither the command-line nor the configuration specify what to
+When neither the command-line nor the configuration specifies what to
 push, the default behavior is used, which corresponds to the `simple`
 value for `push.default`: the current branch is pushed to the
 corresponding upstream branch, but as a safety measure, the push is
-- 
2.42.0.rc0.26.ga73c38ecaa

Re: [PATCH] Fix grammar in git push man page

[Bagas Sanjaya]

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

On Wed, Aug 09, 2023 at 08:40:25PM -0400, Wesley Schwengle wrote:
> -When neither the command-line nor the configuration specify what to
> +When neither the command line nor the configuration specifies what to

IMO either command-line or command line is correct...

-- 
An old man doll... just what I always wanted! - Clara

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

Re: [PATCH] Fix grammar in git push man page

[Bagas Sanjaya]

On 10/08/2023 08:41, Bagas Sanjaya wrote:
> On Wed, Aug 09, 2023 at 08:40:25PM -0400, Wesley Schwengle wrote:
>> -When neither the command-line nor the configuration specify what to
>> +When neither the command line nor the configuration specifies what to
> 
> IMO either command-line or command line is correct...
> 

Oops, I mean both forms (with and without dash) are correct.

-- 
An old man doll... just what I always wanted! - Clara