Merge branch 'lt/rename-no-extra-copy-detection' into next
commit2c1f2713fb2285852ac0cd7c30c7767fc0673ce3
authorJunio C Hamano <gitster@pobox.com>
Wed, 23 Feb 2011 22:23:07 +0000 (23 14:23 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 23 Feb 2011 22:23:07 +0000 (23 14:23 -0800)
treee0a585e647fa80f512fcd5c37a4a178fad4c6ece
parent95db30e162d7ac8841f6babed28342007e04e7f3
parent3a4d67692b5a80213ca47a603fa5505a5990cc87
Merge branch 'lt/rename-no-extra-copy-detection' into next

* 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