Merge branch 'kw/rebase-progress' into next

diff --git a/git-stash.sh b/git-stash.sh
index 39083b4d97b78f8f930ee19185076a4eb268faae..d7bc3224bf852f9840c3ca295492a73d75884a88 100755 (executable)
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -574,7 +574,7 @@ apply_stash () {
 
        if test -n "$u_tree"
        then
-               GIT_INDEX_FILE="$TMPindex" git-read-tree "$u_tree" &&
+               GIT_INDEX_FILE="$TMPindex" git read-tree "$u_tree" &&
                GIT_INDEX_FILE="$TMPindex" git checkout-index --all &&
                rm -f "$TMPindex" ||
                die "$(gettext "Could not restore untracked files from stash entry")"