git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] branch_merged: fix grammar in warning

From
Eric Hanchrow <eric.hanchrow@gmail.com>
Date
Feb 26, 2011, 13:03 UTC
Message-ID
<AANLkTikL1KkSTeNgT2dhE2bGBu5FHY8HiqxfjPMd90sT@mail.gmail.com>
In-Reply-To
<7vbp1z8apg.fsf@alter.siamese.dyndns.org>
OK, here it is again:
From 5445193baac417831d849b9ef5acd5197859bd0b Mon Sep 17 00:00:00 2001
From: Eric Hanchrow <eric.hanchrow@gmail.com>
Date: Fri, 25 Feb 2011 19:29:42 -0800
Subject: [PATCH] branch_merged: fix grammar in warning
Signed-off-by: Eric Hanchrow <eric.hanchrow@gmail.com>
---
 builtin/branch.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/builtin/branch.c b/builtin/branch.c
index 9e546e4..27c2000 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -134,7 +134,7 @@ static int branch_merged(int kind, const char *name,
 	    in_merge_bases(rev, &head_rev, 1) != merged) {
 		if (merged)
 			warning("deleting branch '%s' that has been merged to\n"
-				"         '%s', but it is not yet merged to HEAD.",
+				"         '%s', but has not yet been merged to HEAD.",
 				name, reference_name);
 		else
 			warning("not deleting branch '%s' that is not yet merged to\n"
-- 
1.7.4.1
Previous: Junio C HamanoNext: Junio C Hamano
Message 4 of 5 in “branch_merged: fix grammar in warning”
  1. branch_merged: fix grammar in warningEric Hanchrow, Feb 26, 2011
  2. Jay SoffianFeb 26, 2011
  3. Junio C HamanoFeb 26, 2011
  4. Eric HanchrowFeb 26, 2011
  5. Junio C HamanoFeb 27, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.