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)
commit0d5708594310c2603682f16cfcb742c3f11704f4
treeb8062b3931c06598f2cbc6467660458052fed636
parent9b0b0b4f45bc3d2f12391fe0dd4eaef81db97295
parentdd98d88be7a2f3782e938701102a96cb09d284da
Merge branch 'jk/follow-rename-score' into maint

* jk/follow-rename-score:
  use custom rename score during --follow