| commit | 618faa1dc7cb5898473861c286391d0a4b043107 | |
| author | Junio C Hamano <junkio@cox.net> | |
| Wed, 10 May 2006 02:23:23 +0000 (9 19:23 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sat, 13 May 2006 21:00:15 +0000 (13 14:00 -0700) | ||
| tree | eb997ae55067b2a6a359316e0693055e159796a6 | treesnapshot (tar.gz zip) |
| parent | 66561f5a776f2343331fff5b98adff1000622f42 | commitdiff |
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>
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>
| git-checkout.sh | diffblobblamehistory |