Merge branch 'jk/follow-rename-score' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 28 Dec 2011 19:49:37 +0000 (11:49 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 28 Dec 2011 19:49:37 +0000 (11:49 -0800)
* jk/follow-rename-score:
  use custom rename score during --follow


Trivial merge