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
git · May 10, 2012 · 454bf49 · 454bf49
2 parents 9aa620d + 53876fc
commit 454bf49
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/contrib/rerere-train.sh b/contrib/rerere-train.sh
@@ -7,7 +7,7 @@ USAGE="$me rev-list-args"
 
 SUBDIRECTORY_OK=Yes
 OPTIONS_SPEC=
-. git-sh-setup
+. $(git --exec-path)/git-sh-setup
 require_work_tree
 cd_to_toplevel