X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-checkout.sh;h=a11c939c30f46561adb8179570d825a85fb8b57b;hb=efca578eec57869994da0982e05dcf1dee0bc213;hp=463ed2eaff906edaeb0f6d3f8138798e373c6495;hpb=a549e11cc2fee10ddf66dd98ea79f7c624eee34e;p=git.git diff --git a/git-checkout.sh b/git-checkout.sh index 463ed2eaf..a11c939c3 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