Merge branch 'jc/maint-follow-rename-fix' into next
commit16706d601a2be51d65b7b5d1d6e7d287b1560341
authorJunio C Hamano <gitster@pobox.com>
Sat, 14 Aug 2010 21:59:22 +0000 (14 14:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 14 Aug 2010 21:59:22 +0000 (14 14:59 -0700)
treea68f4e99a2640039d0635947c66357787e2196d2
parent41146fff12877df9ac420fc1ae32208af36d0dea
parent44c48a909ae3d49afcaedb2b2cd042d1e329ee93
Merge branch 'jc/maint-follow-rename-fix' into next

* jc/maint-follow-rename-fix:
  diff --follow: do call diffcore_std() as necessary
  diff --follow: do not waste cycles while recursing
diff.c
diff.h