diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-01-05 20:54:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-01-05 20:54:42 -0800 |
| commit | 5df466c507ee2dd81c2e9002c3fedf3536cde0dc (patch) | |
| tree | 92fff315690007bbbdaa9116570a8a49b01f5420 /git-reset.sh | |
| parent | 58e3fb40f7ca1c28f9105c15166884f80bb22e55 (diff) | |
| parent | 92e802c6ccb96d1b5e8561b0a136d43d82253293 (diff) | |
| download | git-5df466c507ee2dd81c2e9002c3fedf3536cde0dc.tar.xz | |
Merge fixes up to GIT 1.0.7
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-reset.sh')
| -rwxr-xr-x | git-reset.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-reset.sh b/git-reset.sh index eb44ee8cc1..6c9e58ad9a 100755 --- a/git-reset.sh +++ b/git-reset.sh @@ -3,7 +3,7 @@ USAGE='[--mixed | --soft | --hard] [<commit-ish>]' . git-sh-setup -tmp=/var/tmp/reset.$$ +tmp=${GIT_DIR}/reset.$$ trap 'rm -f $tmp-*' 0 1 2 3 15 reset_type=--mixed |