X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-checkout.sh;h=a11c939c30f46561adb8179570d825a85fb8b57b;hb=65aadb92a1ce9605fa2f412b51de91781a3ef3d6;hp=463ed2eaff906edaeb0f6d3f8138798e373c6495;hpb=5f906b1c34a174fb6a5eb03f8063859d1a487721;p=git.git diff --git a/git-checkout.sh b/git-checkout.sh index 463ed2ea..a11c939c 100755 --- a/git-checkout.sh +++ b/git-checkout.sh @@ -144,7 +144,7 @@ else work=`git write-tree` && git read-tree --reset $new && git checkout-index -f -u -q -a && - git read-tree -m -u $old $new $work || exit + git read-tree -m -u --aggressive $old $new $work || exit if result=`git write-tree 2>/dev/null` then