summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-05-02 20:53:15 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-05-02 20:53:15 (GMT)
commit7b871c53db182eec5d44188c37f00a084219270f (patch)
tree90bbe59df38297c04b1da5cf93e2bbb4d86b8cfe /contrib
parentd7c03ca1eac769b04cb3ebee5634173c4622ebb9 (diff)
parent53876fcf3fdc1c46c26fc3a191e74a06e633d5b2 (diff)
downloadgit-7b871c53db182eec5d44188c37f00a084219270f.zip
git-7b871c53db182eec5d44188c37f00a084219270f.tar.gz
git-7b871c53db182eec5d44188c37f00a084219270f.tar.bz2
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
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/rerere-train.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/rerere-train.sh b/contrib/rerere-train.sh
index 2cfe1b9..36b6fee 100755
--- 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