Re: [PATCH v3 00/15] Switch directory rename detection default

2019-04-05 Thread Jacob Keller
On Fri, Apr 5, 2019 at 8:03 AM Elijah Newren wrote: > > This series adds a new configuration option, merge.directoryRenames, > for setting how to make use of directory rename detection heuristics. > The default becomes "conflict", meaning that conflicts are reported > instead of silently moving pa

[PATCH v3 00/15] Switch directory rename detection default

2019-04-05 Thread Elijah Newren
This series adds a new configuration option, merge.directoryRenames, for setting how to make use of directory rename detection heuristics. The default becomes "conflict", meaning that conflicts are reported instead of silently moving paths according to the heuristics. Also, even when merge.directo