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>
Junio C Hamano committed
May 9, 2006 at 19:23 UTC
618faa1dc7cb5898473861c286391d0a4b043107
1 file changed
+1
-1
git-checkout.sh
+1
-1
@@ -144,7 +144,7 @@ else
144
work=`git write-tree` &&
145
git read-tree --reset $new &&
146
git checkout-index -f -u -q -a &&
147
- git read-tree -m -u $old $new $work || exit
147
+ git read-tree -m -u --aggressive $old $new $work || exit
148
149
if result=`git write-tree 2>/dev/null`
150
then