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