* [PATCH] branch_merged: fix grammar in warning
@ 2011-02-26 3:33 Eric Hanchrow
2011-02-26 3:44 ` Jay Soffian
0 siblings, 1 reply; 5+ messages in thread
From: Eric Hanchrow @ 2011-02-26 3:33 UTC (permalink / raw)
To: git
builtin/branch.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/builtin/branch.c b/builtin/branch.c
index 9e546e4..915f270 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 it 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
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] branch_merged: fix grammar in warning
2011-02-26 3:33 [PATCH] branch_merged: fix grammar in warning Eric Hanchrow
@ 2011-02-26 3:44 ` Jay Soffian
2011-02-26 8:24 ` Junio C Hamano
0 siblings, 1 reply; 5+ messages in thread
From: Jay Soffian @ 2011-02-26 3:44 UTC (permalink / raw)
To: Eric Hanchrow; +Cc: git
On Fri, Feb 25, 2011 at 10:33 PM, Eric Hanchrow <eric.hanchrow@gmail.com> wrote:
> builtin/branch.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/builtin/branch.c b/builtin/branch.c
> index 9e546e4..915f270 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 it has not yet been merged to HEAD.",
You can drop the "it" while you're at it. :-)
j.
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] branch_merged: fix grammar in warning
2011-02-26 3:44 ` Jay Soffian
@ 2011-02-26 8:24 ` Junio C Hamano
2011-02-26 13:03 ` Eric Hanchrow
0 siblings, 1 reply; 5+ messages in thread
From: Junio C Hamano @ 2011-02-26 8:24 UTC (permalink / raw)
To: Jay Soffian; +Cc: Eric Hanchrow, git
Jay Soffian <jaysoffian@gmail.com> writes:
> On Fri, Feb 25, 2011 at 10:33 PM, Eric Hanchrow <eric.hanchrow@gmail.com> wrote:
>> builtin/branch.c | 2 +-
>> 1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/builtin/branch.c b/builtin/branch.c
>> index 9e546e4..915f270 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 it has not yet been merged to HEAD.",
>
> You can drop the "it" while you're at it. :-)
>
> j.
Yeah, and we would want a sign-off, too.
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] branch_merged: fix grammar in warning
2011-02-26 8:24 ` Junio C Hamano
@ 2011-02-26 13:03 ` Eric Hanchrow
2011-02-27 9:17 ` Junio C Hamano
0 siblings, 1 reply; 5+ messages in thread
From: Eric Hanchrow @ 2011-02-26 13:03 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Jay Soffian, git
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
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] branch_merged: fix grammar in warning
2011-02-26 13:03 ` Eric Hanchrow
@ 2011-02-27 9:17 ` Junio C Hamano
0 siblings, 0 replies; 5+ messages in thread
From: Junio C Hamano @ 2011-02-27 9:17 UTC (permalink / raw)
To: Eric Hanchrow; +Cc: Jay Soffian, git
Eric Hanchrow <eric.hanchrow@gmail.com> writes:
> OK, here it is again:
Thanks, applied. I ended up also dropping "has", though ;-)
> 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"
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-02-27 9:17 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-26 3:33 [PATCH] branch_merged: fix grammar in warning Eric Hanchrow
2011-02-26 3:44 ` Jay Soffian
2011-02-26 8:24 ` Junio C Hamano
2011-02-26 13:03 ` Eric Hanchrow
2011-02-27 9:17 ` Junio C Hamano
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).