diff options
Diffstat (limited to 'git-checkout.sh')
| -rwxr-xr-x | git-checkout.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/git-checkout.sh b/git-checkout.sh index 77c259380..5613bfc40 100755 --- 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` |