diff --git a/git-reset.sh b/git-reset.sh
index 72ef303aedc69a1d9cdd946a91059638cb2e550a..fe53fc8065dc82c0054ba9891b28a00b0752bf87 100755 (executable)
--- a/git-reset.sh
+++ b/git-reset.sh
#!/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
;;
esac
-rm -f "$GIT_DIR/MERGE_HEAD"
+rm -f "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/rr-cache/MERGE_RR"