Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
cvsimport - cleanup of the multi-indexes handling
[gitweb.git]
/
git-checkout.sh
diff --git
a/git-checkout.sh
b/git-checkout.sh
index 564117f0064aba32e190a49106eaecfdb422b31e..77c25938091b75f51eb3cc5922d67db6333e1e74 100755
(executable)
--- a/
git-checkout.sh
+++ b/
git-checkout.sh
@@
-137,8
+137,7
@@
fi
if [ "$force" ]
then
- git-read-tree --reset $new &&
- git-checkout-index -q -f -u -a
+ git-read-tree --reset -u $new
else
git-update-index --refresh >/dev/null
merge_error=$(git-read-tree -m -u $old $new 2>&1) || (