projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 66561f5) | patch
checkout: use --aggressive when running a 3-way merge (-m).
authorJunio C Hamano <junkio@cox.net>
Wed, 10 May 2006 02:23:23 +0000 (19:23 -0700)
committerJunio C Hamano <junkio@cox.net>
Sat, 13 May 2006 21:00:15 +0000 (14:00 -0700)
commit618faa1dc7cb5898473861c286391d0a4b043107
treeeb997ae55067b2a6a359316e0693055e159796a6tree | snapshot
parent66561f5a776f2343331fff5b98adff1000622f42commit | diff
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>
git-checkout.sh diff | blob | history
The core git plumbing