git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Wesley Schwengle <wesleys@opperschaap.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Fix grammar in git push man page
Date: Wed, 09 Aug 2023 18:13:28 -0700	[thread overview]
Message-ID: <xmqqcyzvk8cn.fsf@gitster.g> (raw)
In-Reply-To: <20230810004044.1420385-1-wesleys@opperschaap.net> (Wesley Schwengle's message of "Wed, 9 Aug 2023 20:40:25 -0400")

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

  reply	other threads:[~2023-08-10  1:13 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-10  0:40 [PATCH] Fix grammar in git push man page Wesley Schwengle
2023-08-10  1:13 ` Junio C Hamano [this message]
2023-08-10  1:21   ` [[PATCH v2]] git-push.txt: fix grammar Wesley Schwengle
2023-08-10  1:41 ` [PATCH] Fix grammar in git push man page Bagas Sanjaya
2023-08-10  1:45   ` Bagas Sanjaya

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqcyzvk8cn.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=wesleys@opperschaap.net \
    /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.
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 NNTP newsgroup(s).