Merge branch 'jc/rerere-train' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 May 2012 17:08:24 +0000 (10:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 May 2012 17:08:24 +0000 (10:08 -0700)
A contrib script "rerere-train" did not work out of the box unless user
futzed with her $PATH.

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


Trivial merge