From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 2 May 2012 20:53:15 +0000 (-0700)
Subject: Merge branch 'jc/rerere-train'
X-Git-Tag: v1.7.11-rc0~69
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7b871c53db182eec5d44188c37f00a084219270f;p=git.git

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

7b871c53db182eec5d44188c37f00a084219270f