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