diff --git a/git-reset.sh b/git-reset.sh
index 36fc8ce25b39682ba256a8d39bf9a393907ef43d..c0feb4435d15da9cc9928800cbe270018f044152 100755 (executable)
--- a/git-reset.sh
+++ b/git-reset.sh
USAGE='[--mixed | --soft | --hard] [<commit-ish>]'
. git-sh-setup
USAGE='[--mixed | --soft | --hard] [<commit-ish>]'
. git-sh-setup
-tmp=${GIT_DIR}/reset.$$
-trap 'rm -f $tmp-*' 0 1 2 3 15
-
update=
reset_type=--mixed
case "$1" in
update=
reset_type=--mixed
case "$1" in
;;
esac
;;
esac
-rm -f "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/rr-cache/MERGE_RR" "$GIT_DIR/SQUASH_MSG"
+rm -f "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/rr-cache/MERGE_RR" \
+ "$GIT_DIR/SQUASH_MSG" "$GIT_DIR/MERGE_MSG"
exit $update_ref_status
exit $update_ref_status