Merge branch 'lt/rename-no-extra-copy-detection' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 16 Mar 2011 23:47:26 +0000 (16:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 Mar 2011 23:47:26 +0000 (16:47 -0700)
commit43c1b6efb86bc68220d28c90b9f6f2d9e278d390
tree6e003086dce687b59f33fca45e7bdcc98d42cd0f
parent4e530c5049a305f82c3e4768b26e6a689aa3c84e
parent3a4d67692b5a80213ca47a603fa5505a5990cc87
Merge branch 'lt/rename-no-extra-copy-detection' into maint

* lt/rename-no-extra-copy-detection:
  diffcore-rename: improve estimate_similarity() heuristics
  diffcore-rename: properly honor the difference between -M and -C
  for_each_hash: allow passing a 'void *data' pointer to callback