X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-reset.sh;h=fe53fc8065dc82c0054ba9891b28a00b0752bf87;hb=1c6bbbf37be5c2b0fce45a57ecfeea2d9b7a3269;hp=72ef303aedc69a1d9cdd946a91059638cb2e550a;hpb=ae2b0f15180d4b044828c836bcab6a990efa5c8e;p=git.git

diff --git a/git-reset.sh b/git-reset.sh
index 72ef303ae..fe53fc806 100755
--- a/git-reset.sh
+++ b/git-reset.sh
@@ -1,11 +1,9 @@
 #!/bin/sh
-. git-sh-setup
 
-usage () {
-	die 'Usage: git reset [--mixed | --soft | --hard]  [<commit-ish>]'
-}
+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
@@ -102,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"