From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff King Subject: [PATCH 1/4] push: fix english in non-fast-forward message Date: Sun, 6 Sep 2009 02:46:25 -0400 Message-ID: <20090906064625.GA28941@coredump.intra.peff.net> References: <20090906064454.GA1643@coredump.intra.peff.net> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Cc: Junio C Hamano , Matthieu Moy , Teemu Likonen , git@vger.kernel.org To: Nanako Shiraishi X-From: git-owner@vger.kernel.org Sun Sep 06 08:46:37 2009 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1MkBWG-0006K4-Oh for gcvg-git-2@lo.gmane.org; Sun, 06 Sep 2009 08:46:37 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754518AbZIFGq2 (ORCPT ); Sun, 6 Sep 2009 02:46:28 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754462AbZIFGq2 (ORCPT ); Sun, 6 Sep 2009 02:46:28 -0400 Received: from peff.net ([208.65.91.99]:57231 "EHLO peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754459AbZIFGq1 (ORCPT ); Sun, 6 Sep 2009 02:46:27 -0400 Received: (qmail 9385 invoked by uid 107); 6 Sep 2009 06:46:44 -0000 Received: from coredump.intra.peff.net (HELO coredump.intra.peff.net) (10.0.0.2) by peff.net (qpsmtpd/0.40) with (AES128-SHA encrypted) SMTP; Sun, 06 Sep 2009 02:46:44 -0400 Received: by coredump.intra.peff.net (sSMTP sendmail emulation); Sun, 06 Sep 2009 02:46:25 -0400 Content-Disposition: inline In-Reply-To: <20090906064454.GA1643@coredump.intra.peff.net> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: We must use an article when referring to the section because it is a non-proper noun, and it must be the definite article because we are referring to a specific section. Signed-off-by: Jeff King --- builtin-push.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/builtin-push.c b/builtin-push.c index 67f6d96..8d72cc2 100644 --- a/builtin-push.c +++ b/builtin-push.c @@ -160,7 +160,7 @@ static int do_push(const char *repo, int flags) if (nonfastforward) { printf("To prevent you from losing history, non-fast-forward updates were rejected.\n" "Merge the remote changes before pushing again.\n" - "See 'non-fast forward' section of 'git push --help' for details.\n"); + "See the 'non-fast forward' section of 'git push --help' for details.\n"); } errs++; } -- 1.6.4.2.266.g981efc.dirty