Merge branch 'pb/configure'

[git.git] / git-checkout.sh

diff --git a/git-checkout.sh b/git-checkout.sh
index 77c25938091b75f51eb3cc5922d67db6333e1e74..5613bfc403f7a4208d2a85de73ec33229e5a3f10 100755 (executable)
--- a/git-checkout.sh
+++ b/git-checkout.sh
@@ -150,8 +150,7 @@ else
        # Match the index to the working tree, and do a three-way.
        git diff-files --name-only | git update-index --remove --stdin &&
        work=`git write-tree` &&
-       git read-tree --reset $new &&
-       git checkout-index -f -u -q -a &&
+       git read-tree --reset -u $new &&
        git read-tree -m -u --aggressive $old $new $work || exit
 
        if result=`git write-tree 2>/dev/null`