From: Justin Lebar <jlebar@google.com>
To: "Jason St. John" <jstjohn@purdue.edu>
Cc: git <git@vger.kernel.org>, Richard Hansen <rhansen@bbn.com>,
"Shawn O. Pearce" <spearce@spearce.org>,
Jeff King <peff@peff.net>, Jonathan Nieder <jrnieder@gmail.com>
Subject: Re: [PATCH 3/4] Fix misuses of "nor" in comments. (v3)
Date: Mon, 31 Mar 2014 14:04:43 -0700 [thread overview]
Message-ID: <CAMuNMfpnojdQi4x_M_k29GBsq_i282Zph3AgLgsZv4arxB3CfA@mail.gmail.com> (raw)
In-Reply-To: <CAEjxke9pe23YAc_D-JmAd+HkgocNuTrwQxSkGS7DaJhgw9GMRg@mail.gmail.com>
Thanks; fixed in v4 (just sent out).
On Mon, Mar 31, 2014 at 12:54 PM, Jason St. John <jstjohn@purdue.edu> wrote:
> 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
next prev parent reply other threads:[~2014-03-31 21:05 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-29 22:59 [PATCH 3/4] Fix misuses of "nor" in comments. (v3) Justin Lebar
2014-03-31 19:54 ` Jason St. John
2014-03-31 21:04 ` Justin Lebar [this message]
2014-03-31 22:00 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAMuNMfpnojdQi4x_M_k29GBsq_i282Zph3AgLgsZv4arxB3CfA@mail.gmail.com \
--to=jlebar@google.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=jstjohn@purdue.edu \
--cc=peff@peff.net \
--cc=rhansen@bbn.com \
--cc=spearce@spearce.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).