diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-05-09 19:23:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-09 19:23:23 -0700 |
| commit | 8d7a397aab561d3782f531e733b617e0e211f04a (patch) | |
| tree | 299591f8e60cda26aa1219e280eb3f4030867c1e | |
| parent | revert/cherry-pick: use aggressive merge. (diff) | |
| download | tgif-8d7a397aab561d3782f531e733b617e0e211f04a.tar.xz | |
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>
| -rwxr-xr-x | git-checkout.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-checkout.sh b/git-checkout.sh index 463ed2eaff..a11c939c30 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 |