Thread (1 message) 1 message, 1 author, 2018-08-31

Re: What's cooking in git.git (Aug 2018, #06; Wed, 29)

flat view

From: Junio C Hamano <hidden>
Date: 2018-08-31 19:53:13

Elijah Newren [off-list ref] writes:
quoted
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'.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help