![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Linus Torvalds <torvalds@osdl.org> | |
| Wed, 10 May 2006 02:22:25 +0000 (19:22 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 10 May 2006 02:22:25 +0000 (19:22 -0700) | ||
| commit | d1802851b0c112a065b43e3f83d631f867b7e1ce | |
| tree | a2916e2e9cd501f87c85dd0c37294fed4e199bed | tree | snapshot |
| parent | 28cc4ab4224164971a523e8a6c222b5ab2bae27d | commit | diff |
revert/cherry-pick: use aggressive merge.
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-revert.sh | diff | blob | history |