X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-reset.sh;h=fe53fc8065dc82c0054ba9891b28a00b0752bf87;hb=4e783b41e09fb14b8ff72348ec2307fd1d5dec46;hp=f9995cadf563a7b3b2c1dcdeea3bf862feac2e4b;hpb=bf7960eb51a26bcf52f27a60bfcf005661266b1e;p=git.git

diff --git a/git-reset.sh b/git-reset.sh
index f9995cad..fe53fc80 100755
--- a/git-reset.sh
+++ b/git-reset.sh
@@ -1,7 +1,9 @@
 #!/bin/sh
-. git-sh-setup || die "Not a git archive"
 
-tmp=/var/tmp/reset.$$
+USAGE='[--mixed | --soft | --hard]  [<commit-ish>]'
+. git-sh-setup
+
+tmp=${GIT_DIR}/reset.$$
 trap 'rm -f $tmp-*' 0 1 2 3 15
 
 reset_type=--mixed
@@ -10,6 +12,8 @@ case "$1" in
 	reset_type="$1"
 	shift
 	;;
+-*)
+        usage ;;
 esac
 
 rev=$(git-rev-parse --verify --default HEAD "$@") || exit
@@ -96,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"