projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'jc/nostat'
[git.git]
/
git-reset.sh
diff --git
a/git-reset.sh
b/git-reset.sh
index
eb44ee8
..
fe53fc8
100755
(executable)
--- a/
git-reset.sh
+++ b/
git-reset.sh
@@
-3,7
+3,7
@@
USAGE='[--mixed | --soft | --hard] [<commit-ish>]'
. git-sh-setup
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
trap 'rm -f $tmp-*' 0 1 2 3 15
reset_type=--mixed
@@
-100,4
+100,4
@@
case "$reset_type" in
;;
esac
;;
esac
-rm -f "$GIT_DIR/MERGE_HEAD"
+rm -f "$GIT_DIR/MERGE_HEAD"
"$GIT_DIR/rr-cache/MERGE_RR"