X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-reset.sh;h=fe53fc8065dc82c0054ba9891b28a00b0752bf87;hb=77abf6db91b44fff6d338ab7bbdd627366c135eb;hp=eb44ee8cc197b7ff11159cf046b790cf693d3a72;hpb=9a26dbd120110ad4e07d3047abc13d615183c8ec;p=git.git

diff --git a/git-reset.sh b/git-reset.sh
index eb44ee8c..fe53fc80 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
@@ -100,4 +100,4 @@ case "$reset_type" in
 	;;
 esac
 
-rm -f "$GIT_DIR/MERGE_HEAD"
+rm -f "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/rr-cache/MERGE_RR"