Re: [PATCH] push: fix typo in advice message
- From
Jeff King <peff@peff.net>
- Date
- Jul 29, 2013, 04:55 UTC
- Message-ID
- <20130729045516.GC4766@sigill.intra.peff.net>
- 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:
Show 15 quoted lines
> 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