Re: [PATCH 3/4] Fix misuses of "nor" in comments. (v3)

2014-03-31 Thread Junio C Hamano
Justin Lebar writes: > Thanks; fixed in v4 (just sent out). I only saw [3/4] that was marked with (v3) at the end, without [{1,2,4}/4]. As you seem to be renumbering from the very original (which had "l10n" at number 3), only sending out what you changed, expecting that everybody else knows wha

Re: [PATCH 3/4] Fix misuses of "nor" in comments. (v3)

2014-03-31 Thread Justin Lebar
Thanks; fixed in v4 (just sent out). On Mon, Mar 31, 2014 at 12:54 PM, Jason St. John wrote: > On Sat, Mar 29, 2014 at 6:59 PM, Justin Lebar wrote: >> This version applies successfully to master, maint, next, and pu. The other >> patches in the previous version of this queue apply successfully

Re: [PATCH 3/4] Fix misuses of "nor" in comments. (v3)

2014-03-31 Thread Jason St. John
On Sat, Mar 29, 2014 at 6:59 PM, Justin Lebar wrote: > This version applies successfully to master, maint, next, and pu. The other > patches in the previous version of this queue apply successfully without any > changes. > > Signed-off-by: Justin Lebar > > --- > Makefile

[PATCH 3/4] Fix misuses of "nor" in comments. (v3)

2014-03-29 Thread Justin Lebar
This version applies successfully to master, maint, next, and pu. The other patches in the previous version of this queue apply successfully without any changes. Signed-off-by: Justin Lebar --- Makefile| 2 +- builtin/apply.c | 2

Re: [PATCH 3/4] Fix misuses of "nor" in comments

2014-03-28 Thread Justin Lebar
> I feel like I'm splitting hairs, but I think there's a change in > meaning if you use that phrasing. The difference being "not expecting" > vs. "should not". I don't know which is correct, so I'll defer that to > someone else. Okay, changed to + * This shouldn't be be set by the Makefile or by

Re: [PATCH 3/4] Fix misuses of "nor" in comments

2014-03-22 Thread Jason St. John
On Thu, Mar 20, 2014 at 7:13 PM, Justin Lebar wrote: > Thanks for the quick reply. > > When I send a new patch, should I fold these changes into the original > commit, or should I send them as a separate commit? > >>> diff --git a/builtin/apply.c b/builtin/apply.c >>> index b0d0986..6013e19 100644

Re: [PATCH 3/4] Fix misuses of "nor" in comments

2014-03-21 Thread Junio C Hamano
Justin Lebar writes: > Thanks for the quick reply. > > When I send a new patch, should I fold these changes into the original > commit, or should I send them as a separate commit? While a patch is still in an early discussion stage, consider their earlier incarnation rejected and send them afres

Re: [PATCH 3/4] Fix misuses of "nor" in comments

2014-03-21 Thread Junio C Hamano
Justin Lebar writes: > Thanks for the quick reply. > > When I send a new patch, should I fold these changes into the original > commit, or should I send them as a separate commit? > >>> diff --git a/builtin/apply.c b/builtin/apply.c >>> index b0d0986..6013e19 100644 >>> --- a/builtin/apply.c >>>

Re: [PATCH 3/4] Fix misuses of "nor" in comments

2014-03-20 Thread Justin Lebar
Thanks for the quick reply. When I send a new patch, should I fold these changes into the original commit, or should I send them as a separate commit? >> diff --git a/builtin/apply.c b/builtin/apply.c >> index b0d0986..6013e19 100644 >> --- a/builtin/apply.c >> +++ b/builtin/apply.c >> @@ -4061,7

Re: [PATCH 3/4] Fix misuses of "nor" in comments

2014-03-20 Thread Jason St. John
On Thu, Mar 20, 2014 at 6:16 PM, Justin Lebar wrote: > Signed-off-by: Justin Lebar > --- > Makefile| 2 +- > builtin/apply.c | 2 +- > builtin/checkout.c | 2 +- > builtin/log.c

[PATCH 3/4] Fix misuses of "nor" in comments

2014-03-20 Thread Justin Lebar
Signed-off-by: Justin Lebar --- Makefile| 2 +- builtin/apply.c | 2 +- builtin/checkout.c | 2 +- builtin/log.c | 2 +- builtin/pack-objects.c | 2 +- built