Code

Merge branch 'jc/rename-degrade-cc-to-c' into pu
authorJunio C Hamano <gitster@pobox.com>
Mon, 31 Jan 2011 03:03:21 +0000 (19:03 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 31 Jan 2011 03:03:21 +0000 (19:03 -0800)
commit71ab769877886fb116cfc3ff445037ff0424fdd2
tree803d4ce4627d6031d973a22732425f629654b175
parent53a3a8fc59e83d6cee863d67e053d07b27370bab
parent28408246ad62abce141bae3b12d7918a3032575a
Merge branch 'jc/rename-degrade-cc-to-c' into pu

* jc/rename-degrade-cc-to-c:
  diffcore-rename: fall back to -C when -C -C busts the rename limit
  diffcore-rename: record filepair for rename src
  diffcore-rename: refactor "too many candidates" logic