Merge branch 'jc/rerere-train'
commit7b871c53db182eec5d44188c37f00a084219270f
authorJunio C Hamano <gitster@pobox.com>
Wed, 2 May 2012 20:53:15 +0000 (2 13:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 2 May 2012 20:53:15 +0000 (2 13:53 -0700)
tree90bbe59df38297c04b1da5cf93e2bbb4d86b8cfe
parentd7c03ca1eac769b04cb3ebee5634173c4622ebb9
parent53876fcf3fdc1c46c26fc3a191e74a06e633d5b2
Merge branch 'jc/rerere-train'

A script written long time ago proved to be useful this week for me ;-)
with a minor tweak.

* jc/rerere-train:
  contrib/rerere-train: use installed git-sh-setup