From: Junio C Hamano <gitster@pobox.com>
To: Justin Lebar <jlebar@google.com>
Cc: "Jason St. John" <jstjohn@purdue.edu>, 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>,
Justin Lebar <jlebar@gmail.com>
Subject: Re: [PATCH 3/4] Fix misuses of "nor" in comments
Date: Fri, 21 Mar 2014 10:52:07 -0700 [thread overview]
Message-ID: <xmqq4n2rv3qw.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <CAMuNMfov+Z0Hx_a-hZ2ZGRdkTtw1eqUn01gWEQ+caT3VcHZkVQ@mail.gmail.com> (Justin Lebar's message of "Thu, 20 Mar 2014 16:13:45 -0700")
Justin Lebar <jlebar@google.com> 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
>>> +++ b/builtin/apply.c
>>> @@ -4061,7 +4061,7 @@ static int write_out_one_reject(struct patch *patch)
>>> return error(_("cannot open %s: %s"), namebuf, strerror(errno));
>>>
>>> /* Normal git tools never deal with .rej, so do not pretend
>>> - * this is a git patch by saying --git nor give extended
>>> + * this is a git patch by saying --git or giving extended
>>> * headers. While at it, maybe please "kompare" that wants
>>> * the trailing TAB and some garbage at the end of line ;-).
>>> */
>>
>> I don't think the change from "give" to "giving" here is grammatically correct.
>
> Is it? I might be misunderstanding the sentence, then. I parse the
> new sentence as...
The new sentence should say what the original wanted to say, which I
think was:
- Do not pretend this is a git patch by saying --git
- Do not show extended headers.
I however think that extended headers is one attribute of a patch
being a "git patch", so I would say that the break down of your new
version:
> Do not pretend this is a git patch by
> - saying --git, or
> - giving extended headers.
makes sense.
next prev parent reply other threads:[~2014-03-21 17:52 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-20 22:16 [PATCH 0/4] Fix misuses of "nor" (v2) Justin Lebar
2014-03-20 22:16 ` [PATCH 1/4] Documentation: Fix misuses of "nor" Justin Lebar
2014-03-20 22:16 ` [PATCH 2/4] contrib: " Justin Lebar
2014-03-20 22:16 ` [PATCH 3/4] Fix misuses of "nor" in comments Justin Lebar
2014-03-20 22:34 ` Jason St. John
2014-03-20 23:13 ` Justin Lebar
2014-03-21 17:52 ` Junio C Hamano [this message]
2014-03-21 17:58 ` Junio C Hamano
2014-03-22 23:47 ` Jason St. John
2014-03-29 1:52 ` Justin Lebar
2014-03-20 22:16 ` [PATCH 4/4] Fix misuses of "nor" outside comments and in tests Justin Lebar
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq4n2rv3qw.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jlebar@gmail.com \
--cc=jlebar@google.com \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).