diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-10 10:08:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-10 10:08:24 -0700 |
| commit | 454bf49930f9ba7e1fc9a39d9d8650f3e798c3fd (patch) | |
| tree | 9301df80e36fd1d4ab78af4b65ef89f2a0008b26 | |
| parent | 9aa620dfae29183c57ecc351a097f9553d1b1ac1 (diff) | |
| parent | 53876fcf3fdc1c46c26fc3a191e74a06e633d5b2 (diff) | |
| download | git-454bf49930f9ba7e1fc9a39d9d8650f3e798c3fd.tar.gz | |
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
| -rwxr-xr-x | contrib/rerere-train.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/rerere-train.sh b/contrib/rerere-train.sh index 2cfe1b936b..36b6feebe0 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 |