From: Junio C Hamano <gitster@pobox•com>
To: Matt McCutchen <matt@mattmccutchen•net>
Cc: git@vger•kernel.org
Subject: Re: [PATCH] merge-recursive: make "CONFLICT (rename/delete)" message show both paths
Date: Wed, 01 Feb 2017 15:28:49 -0800 [thread overview]
Message-ID: <xmqqa8a5mqxa.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <1485991441.28767.2.camel@mattmccutchen.net> (Matt McCutchen's message of "Wed, 01 Feb 2017 18:24:01 -0500")
Matt McCutchen <matt@mattmccutchen•net> writes:
> On Wed, 2017-02-01 at 12:56 -0800, Junio C Hamano wrote:
>
>> Let me make sure if I understood your changes correctly:
>> ...
>> So the condition to guard the call to update_file() also looks
>> correct to me.
>
> All of the above matches my understanding. Would it have saved you
> time if I had included some of this explanation in the patch "cover
> letter"?
The fact that I arrived at the same understanding by reading the
change without peeking at such a cheat-sheet gives me more peace of
mind ;-)
Thanks.
prev parent reply other threads:[~2017-02-01 23:29 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-28 20:37 [PATCH] merge-recursive: make "CONFLICT (rename/delete)" message show both paths Matt McCutchen
2017-01-30 23:21 ` Junio C Hamano
2017-02-01 20:56 ` Junio C Hamano
2017-02-01 23:24 ` Matt McCutchen
2017-02-01 23:28 ` Junio C Hamano [this message]
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=xmqqa8a5mqxa.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=matt@mattmccutchen$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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