From: Jeff King <peff@peff.net>
To: Ralf Thielow <ralf.thielow@gmail.com>
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH] push: fix typo in advice message
Date: Sun, 28 Jul 2013 21:55:16 -0700 [thread overview]
Message-ID: <20130729045516.GC4766@sigill.intra.peff.net> (raw)
In-Reply-To: <1375071832-2959-1-git-send-email-ralf.thielow@gmail.com>
On Mon, Jul 29, 2013 at 06:23:52AM +0200, Ralf Thielow wrote:
> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
> ---
> builtin/push.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/builtin/push.c b/builtin/push.c
> index 6d36c24..04abd2d 100644
> --- a/builtin/push.c
> +++ b/builtin/push.c
> @@ -250,7 +250,7 @@ static const char message_advice_ref_fetch_first[] =
> N_("Updates were rejected because the remote contains work that you do\n"
> "not have locally. This is usually caused by another repository pushing\n"
> "to the same ref. You may want to first integrate the remote changes\n"
> - "(e.g., 'git pull ...') before pushing again.\n"
> + "(e.g. 'git pull ...') before pushing again.\n"
I do not think the comma is a typo. In American English it is usually
preferred, but googling "comma after e.g." seems to indicate that it is
not in British English.
Grep shows that we use both styles in quite a few places.
-Peff
prev parent reply other threads:[~2013-07-29 4:55 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-29 4:23 [PATCH] push: fix typo in advice message Ralf Thielow
2013-07-29 4:55 ` Jeff King [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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130729045516.GC4766@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=ralf.thielow@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.
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).