Re: [PATCH 3/4] Fix misuses of "nor" in comments. (v3)
Thanks; fixed in v4 (just sent out).
On Mon, Mar 31, 2014 at 12:54 PM, Jason St. John <jstjohn@purdue.edu> wrote:
Show 51 quoted lines
> On Sat, Mar 29, 2014 at 6:59 PM, Justin Lebar <jlebar@google.com> 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 <jlebar@google.com>
>>
>> ---
>> Makefile | 2 +-
>> builtin/apply.c | 2 +-
>> builtin/checkout.c | 2 +-
>> builtin/log.c | 2 +-
>> builtin/pack-objects.c | 2 +-
>> column.c | 4 ++--
>> contrib/examples/git-checkout.sh | 2 +-
>> contrib/examples/git-reset.sh | 4 ++--
>> contrib/fast-import/import-directories.perl | 4 ++--
>> delta.h | 2 +-
>> diff.c | 2 +-
>> git-am.sh | 2 +-
>> gitweb/gitweb.perl | 2 +-
>> http.h | 4 ++--
>> perl/Git/SVN.pm | 2 +-
>> perl/Git/SVN/Migration.pm | 2 +-
>> pkt-line.h | 8 ++++----
>> remote.c | 2 +-
>> sha1_file.c | 2 +-
>> test-chmtime.c | 2 +-
>> 20 files changed, 27 insertions(+), 27 deletions(-)
>>
>
> <snip>
>
>> diff --git a/http.h b/http.h
>> index cd37d58..0a7d286 100644
>> --- a/http.h
>> +++ b/http.h
>> @@ -13,8 +13,8 @@
>> /*
>> * We detect based on the cURL version if multi-transfer is
>> * usable in this implementation and define this symbol accordingly.
>> - * This is not something Makefile should set nor users should pass
>> - * via CFLAGS.
>> + * This shouldn't be be set by the Makefile or by the user (e.g. via
>> + * CFLAGS).
>> */
>> #undef USE_CURL_MULTI
>
> There's a rather minor typo here: "be be"
>
> Jason