{"thread":{"id":"34555","subject":"[PATCH] push: fix typo in advice message","startedAt":"2013-07-29T04:23:52Z","lastAt":"2013-07-29T04:55:16Z","messageCount":2,"participants":["Ralf Thielow","Jeff King"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"224208","messageId":"1375071832-2959-1-git-send-email-ralf.thielow@gmail.com","threadId":"34555","inReplyTo":null,"subject":"[PATCH] push: fix typo in advice message","fromName":"Ralf Thielow","fromEmail":"ralf.thielow@gmail.com","sentAt":"2013-07-29T04:23:52Z","receivedAt":"2013-07-29T04:23:52Z","isPatch":true,"sender":{"key":"ralf.thielow@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1275832?v=4"},"body":"Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>\n---\n builtin/push.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/builtin/push.c b/builtin/push.c\nindex 6d36c24..04abd2d 100644\n--- a/builtin/push.c\n+++ b/builtin/push.c\n@@ -250,7 +250,7 @@ static const char message_advice_ref_fetch_first[] =\n \tN_(\"Updates were rejected because the remote contains work that you do\\n\"\n \t   \"not have locally. This is usually caused by another repository pushing\\n\"\n \t   \"to the same ref. You may want to first integrate the remote changes\\n\"\n-\t   \"(e.g., 'git pull ...') before pushing again.\\n\"\n+\t   \"(e.g. 'git pull ...') before pushing again.\\n\"\n \t   \"See the 'Note about fast-forwards' in 'git push --help' for details.\");\n \n static const char message_advice_ref_already_exists[] =\n-- \n1.8.2.1873.gfc589a4\n"},{"id":"224211","messageId":"20130729045516.GC4766@sigill.intra.peff.net","threadId":"34555","inReplyTo":"1375071832-2959-1-git-send-email-ralf.thielow@gmail.com","subject":"Re: [PATCH] push: fix typo in advice message","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2013-07-29T04:55:16Z","receivedAt":"2013-07-29T04:55:16Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Mon, Jul 29, 2013 at 06:23:52AM +0200, Ralf Thielow wrote:\n\n> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>\n> ---\n>  builtin/push.c | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n> \n> diff --git a/builtin/push.c b/builtin/push.c\n> index 6d36c24..04abd2d 100644\n> --- a/builtin/push.c\n> +++ b/builtin/push.c\n> @@ -250,7 +250,7 @@ static const char message_advice_ref_fetch_first[] =\n>  \tN_(\"Updates were rejected because the remote contains work that you do\\n\"\n>  \t   \"not have locally. This is usually caused by another repository pushing\\n\"\n>  \t   \"to the same ref. You may want to first integrate the remote changes\\n\"\n> -\t   \"(e.g., 'git pull ...') before pushing again.\\n\"\n> +\t   \"(e.g. 'git pull ...') before pushing again.\\n\"\n\nI do not think the comma is a typo. In American English it is usually\npreferred, but googling \"comma after e.g.\" seems to indicate that it is\nnot in British English.\n\nGrep shows that we use both styles in quite a few places.\n\n-Peff\n"}]}