Re: [PATCH v2 15/15] merge-recursive: switch directory rename detection default

2019-04-01 Thread Elijah Newren
On Sat, Mar 30, 2019 at 2:12 AM Ævar Arnfjörð Bjarmason wrote: > On Sat, Mar 30 2019, Elijah Newren wrote: > > I may have more, just quickly skimming this for the first time... > > > merge.renames:: > > - Whether and how Git detects renames. If set to "false", > > - rename detection is d

Re: [PATCH v2 15/15] merge-recursive: switch directory rename detection default

2019-03-30 Thread Ævar Arnfjörð Bjarmason
On Sat, Mar 30 2019, Elijah Newren wrote: I may have more, just quickly skimming this for the first time... > merge.renames:: > - Whether and how Git detects renames. If set to "false", > - rename detection is disabled. If set to "true", basic rename > - detection is enabled. Def

[PATCH v2 15/15] merge-recursive: switch directory rename detection default

2019-03-29 Thread Elijah Newren
When all of x/a, x/b, and x/c have moved to z/a, z/b, and z/c on one branch, there is a question about whether x/d added on a different branch should remain at x/d or appear at z/d when the two branches are merged. There are different possible viewpoints here: A) The file was placed at x/d; it'