From: Junio C Hamano <gitster@pobox.com>
To: Jerry Zhang <jerry@skydio.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Ross Yeager <ross@skydio.com>, Abraham Bachrach <abe@skydio.com>,
Brian Kubisiak <brian.kubisiak@skydio.com>
Subject: Re: [PATCH V2] git-apply: modify prints to account for --3way changes
Date: Thu, 29 Apr 2021 09:58:14 +0900 [thread overview]
Message-ID: <xmqqlf91aoux.fsf@gitster.g> (raw)
In-Reply-To: <CAMKO5CvLW=XYFby1pBj7FHcXpNTM-qMB8UakDG+N=UXU2Gw7fQ@mail.gmail.com> (Jerry Zhang's message of "Wed, 28 Apr 2021 11:26:09 -0700")
Jerry Zhang <jerry@skydio.com> writes:
> On Wed, Apr 28, 2021 at 12:32 AM Junio C Hamano <gitster@pobox.com> wrote:
>>
>> Jerry Zhang <jerry@skydio.com> writes:
>>
>> > Subject: Re: [PATCH V2] git-apply: modify prints to account for --3way changes
>>
>> Sorry that I missed this in the previous round, but what do you mean
>> by "prints" here?
>>
>> > "git apply" specifically calls out when it is falling back to 3way
>> > merge application. Since the order changed to preferring 3way and
>> > falling back to direct application, continue that behavior by
>> > printing whenever 3way fails and git has to fall back.
>>
>> I am guessing it is safe to s/modify prints/adjust messages/ after
>> reading this explanation.
> Sure, do you want a new patch for that?
It's not what *I* want ;-).
If what you sent is not sufficiently clear to help readers, you
would want to update, no?
next prev parent reply other threads:[~2021-04-29 0:58 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-27 1:13 [PATCH] git-apply: modify prints to account for --3way changes Jerry Zhang
2021-04-27 7:46 ` Junio C Hamano
2021-04-27 19:40 ` [PATCH V2] " Jerry Zhang
2021-04-28 7:32 ` Junio C Hamano
2021-04-28 18:26 ` Jerry Zhang
2021-04-29 0:58 ` Junio C Hamano [this message]
2021-04-29 2:35 ` [PATCH V3] git-apply: adjust messages " Jerry Zhang
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=xmqqlf91aoux.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=abe@skydio.com \
--cc=brian.kubisiak@skydio.com \
--cc=git@vger.kernel.org \
--cc=jerry@skydio.com \
--cc=ross@skydio.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.