projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Be more like the 'resolve' strategy.
[git.git]
/
git-checkout.sh
diff --git
a/git-checkout.sh
b/git-checkout.sh
index
4e7c57a
..
4a605cd
100755
(executable)
--- a/
git-checkout.sh
+++ b/
git-checkout.sh
@@
-55,6
+55,7
@@
then
git-read-tree --reset $new &&
git-checkout-index -q -f -u -a
else
git-read-tree --reset $new &&
git-checkout-index -q -f -u -a
else
+ git-update-index --refresh >/dev/null
git-read-tree -m -u $old $new
fi
git-read-tree -m -u $old $new
fi