From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 10 May 2012 17:08:24 +0000 (-0700)
Subject: Merge branch 'jc/rerere-train' into maint
X-Git-Tag: v1.7.10.2~19
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=454bf49930f9ba7e1fc9a39d9d8650f3e798c3fd;p=git.git

Merge branch 'jc/rerere-train' into maint

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
---

454bf49930f9ba7e1fc9a39d9d8650f3e798c3fd