cherry-pick across renames [was: minutes of ESC call ...]

[Lionel Elie Mamane]

On Tue, Apr 16, 2013 at 10:19:28AM +0200, Miklos Vajna wrote:

> On Tue, Apr 16, 2013 at 08:15:07AM +0200, Lionel Elie Mamane <lionel at mamane.lu> wrote:

>> Great, how do you make it do that? That is _so_ not my experience,
>> when cherry-picking commits touching reportbuilder/java/{com,org}
>> to/from libreoffice-4-0 from/to master.

> It seems the git rename detection is O(N^2), so the default number
> of renamed files is limited to avoid long merges.

> git config diff.renameLimit 3000 (the default is 1000)

> and then I could cherry-pick a sample change, affecting
> reportbuilder/java/org/libreoffice/report/JobDefinitionException.java
> from master to -4-0 without getting conflicts.

Did that. Thanks for finding this out!

-- 
Lionel