From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 31 Aug 2018 19:53:09 GMT
Subject: Re: What's cooking in git.git (Aug 2018, #06; Wed, 29)
Message-ID: <xmqqr2ie1ffe.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <CABPp-BE43kFwRZ90-EWB9Em6xk-T=QfNXCepY=0O5OYYZe-qAg@mail.gmail.com>

Elijah Newren <newren@gmail.com> writes:

>> Suggestions for a better rewrite is very much appreciated.
>
> That makes sense.  I'm not sure I can concisely convey all the right
> points, but here's a stab at rewording:
>
> Recent addition of "directory rename" heuristics to the
> merge-recursive backend makes the command susceptible to false
> positives and false negatives.  In the context of "git am -3", which
> does not know about surrounding unmodified paths and thus cannot
> inform the merge machinery about the full trees involved, this risk is
> particularly severe.  As such, the heuristic is disabled for "git am
> -3" to keep the machinery "more stupid but predictable".

Excellent.  Let me use that when merging it to 'next'.