Add get_merge_bases_clean()

diff --git a/git-reset.sh b/git-reset.sh
index 0ee3e3e154a7721dc9d604fd400d2f53eaad9940..46451d0d64bdff2c0061d100c8d3b3bd38c21454 100755 (executable)
--- a/git-reset.sh
+++ b/git-reset.sh
@@ -48,7 +48,7 @@ then
 else
        rm -f "$GIT_DIR/ORIG_HEAD"
 fi
-git-update-ref HEAD "$rev"
+git-update-ref -m "reset $reset_type $@" HEAD "$rev"
 
 case "$reset_type" in
 --hard )
@@ -61,4 +61,4 @@ case "$reset_type" in
        ;;
 esac
 
-rm -f "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/rr-cache/MERGE_RR"
+rm -f "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/rr-cache/MERGE_RR" "$GIT_DIR/SQUASH_MSG"