From: Junio C Hamano Date: Wed, 10 May 2006 02:23:23 +0000 (-0700) Subject: checkout: use --aggressive when running a 3-way merge (-m). X-Git-Tag: v1.3.3~7 X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=618faa1dc7cb5898473861c286391d0a4b043107;p=git.git 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 --- 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