On Tuesday 16 October 2007 19:34, Linus Torvalds wrote: > On Tue, 16 Oct 2007, Lars Hjemli wrote: > > On 10/16/07, Jan Wielemaker <wielemak@xxxxxxxxxxxxxx> wrote: > > > * On a somewhat bigger test I moved a large directory using > > > "git mv dir newdir" (where newdir is an existing directory). > > > Now "git status" gives a lot of new and deleted files!? > > > > You could try to adjust diff.renameLimit in .git/config > > Yes. The default rename limit I did has turned out to be a disaster. It's > quite common to have more than a 100x100 matrix of deleted files. > > For people with any kind of beefy hardware, I'd just suggest doing a > > git config --global diff.renamelimit 0 > > which disables the rename limiting entirely. > > There's a related (embarrassing) problem, namely that I think that the > current released versions (1.5.3.3 and 1.5.3.4) don't honor the > renamelimit configuration for merging, so if you do merges across renames > with changes to the renamed files, you need to use either an older git > that didn't have the rename limit at all (nor any of the speed-ups) or you > need to use current git from the 'master' branch. Thanks both of you. I can master that. I understand I only should ensure to be running the latest version if I start the merge? Cheers --- Jan - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
