From: Junio C Hamano <gitster@pobox•com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail•com>
Cc: git@vger•kernel.org
Subject: Re: [PATCH 3/3] githooks.txt: Minor improvements to the grammar & phrasing
Date: Mon, 25 Apr 2016 11:33:13 -0700 [thread overview]
Message-ID: <xmqqinz5les6.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <1461529229-15222-3-git-send-email-avarab@gmail.com> ("Ævar Arnfjörð Bjarmason"'s message of "Sun, 24 Apr 2016 20:20:29 +0000")
Ævar Arnfjörð Bjarmason <avarab@gmail•com> writes:
> -This hook is invoked by 'git am' script. It takes a single
> +This hook is invoked by 'git am'. It takes a single
Good, as it does not matter to the readers that "am" happens to be
implemented as a script.
> parameter, the name of the file that holds the proposed commit
> -log message. Exiting with non-zero status causes
> -'git am' to abort before applying the patch.
> +log message. Exiting with non-zero causes 'git am' to abort
> +before applying the patch.
I am not sure why you dropped "status" from here. The result is
harder to grok, at least to me. Perhaps "with a non-zero status"?
> The hook is allowed to edit the message file in place, and can
> -be used to normalize the message into some project standard
> -format (if the project has one). It can also be used to refuse
> -the commit after inspecting the message file.
> +be used to e.g. normalize the message into some project standard
> +format. It can also be used to refuse the commit after inspecting
> +the message file.
OK. Or we can even drop "e.g." and the result still reads perfectly
fine.
> This hook is invoked by 'git commit', and can be bypassed
> -with `--no-verify` option. It takes no parameter, and is
> +with the `--no-verify` option. It takes no parameters, and is
> invoked before obtaining the proposed commit log message and
> -making a commit. Exiting with non-zero status from this script
> -causes the 'git commit' to abort.
> +making a commit. Exiting with a non-zero status from this script
> +causes the 'git commit' command to abort before creating a commit.
Good. And you kept "status" here, which is doubly good.
next prev parent reply other threads:[~2016-04-25 18:33 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-24 20:20 [PATCH 1/3] githooks.txt: Improve the intro section Ævar Arnfjörð Bjarmason
2016-04-24 20:20 ` [PATCH 2/3] githooks.txt: Amend dangerous advice about 'update' hook ACL Ævar Arnfjörð Bjarmason
2016-04-24 20:32 ` Jacob Keller
2016-04-24 21:26 ` [PATCH v2 " Ævar Arnfjörð Bjarmason
2016-04-25 18:29 ` [PATCH " Junio C Hamano
2016-04-26 17:39 ` Ævar Arnfjörð Bjarmason
2016-04-24 20:20 ` [PATCH 3/3] githooks.txt: Minor improvements to the grammar & phrasing Ævar Arnfjörð Bjarmason
2016-04-25 18:33 ` Junio C Hamano [this message]
2016-04-26 16:55 ` Ævar Arnfjörð Bjarmason
2016-04-25 5:35 ` [PATCH 1/3] githooks.txt: Improve the intro section Eric Sunshine
2016-04-25 14:14 ` [PATCH v3 0/3] Improvements to githooks.txt documentation Ævar Arnfjörð Bjarmason
2016-04-25 18:34 ` Junio C Hamano
2016-04-25 14:14 ` [PATCH v3 1/3] githooks.txt: Improve the intro section Ævar Arnfjörð Bjarmason
2016-04-25 14:14 ` [PATCH v3 2/3] githooks.txt: Amend dangerous advice about 'update' hook ACL Ævar Arnfjörð Bjarmason
2016-04-25 14:14 ` [PATCH v3 3/3] githooks.txt: Minor improvements to the grammar & phrasing Ævar Arnfjörð Bjarmason
2016-04-25 18:23 ` [PATCH 1/3] githooks.txt: Improve the intro section Junio C Hamano
2016-04-26 17:51 ` Ævar Arnfjörð Bjarmason
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=xmqqinz5les6.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=avarab@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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