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)
commit454bf49930f9ba7e1fc9a39d9d8650f3e798c3fd
tree9301df80e36fd1d4ab78af4b65ef89f2a0008b26
parent9aa620dfae29183c57ecc351a097f9553d1b1ac1
parent53876fcf3fdc1c46c26fc3a191e74a06e633d5b2
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