summaryrefslogtreecommitdiff
path: root/git-checkout.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-10 02:23:23 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-05-10 02:23:23 (GMT)
commit8d7a397aab561d3782f531e733b617e0e211f04a (patch)
tree299591f8e60cda26aa1219e280eb3f4030867c1e /git-checkout.sh
parentd1802851b0c112a065b43e3f83d631f867b7e1ce (diff)
downloadgit-8d7a397aab561d3782f531e733b617e0e211f04a.zip
git-8d7a397aab561d3782f531e733b617e0e211f04a.tar.gz
git-8d7a397aab561d3782f531e733b617e0e211f04a.tar.bz2
checkout: use --aggressive when running a 3-way merge (-m).
After doing an in-index 3-way merge, we always do the stock "merge-index merge-one-file" without doing anything fancy; use of --aggressive helps performance quite a bit. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-checkout.sh')
-rwxr-xr-xgit-checkout.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-checkout.sh b/git-checkout.sh
index 463ed2e..a11c939 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