merge-recursive: avoid incorporating uncommitted changes in a merge

diff --git a/git-rebase.sh b/git-rebase.sh
index ad8415e3cf6907044b0730b59fc2e6ff30ab7174..aabbf6b69e5396080234a08e03cd951f9fe5d964 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -166,7 +166,7 @@ apply_autostash () {
        if test -f "$state_dir/autostash"
        then
                stash_sha1=$(cat "$state_dir/autostash")
-               if git stash apply $stash_sha1 2>&1 >/dev/null
+               if git stash apply $stash_sha1 >/dev/null 2>&1
                then
                        echo "$(gettext 'Applied autostash.')" >&2
                else
@@ -350,6 +350,9 @@ do
                shift
                break
                ;;
+       *)
+               usage
+               ;;
        esac
        shift
 done