projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from: d180285)
revert/cherry-pick: use aggressive merge.
authorLinus Torvalds <torvalds@osdl.org>
Wed, 10 May 2006 02:22:25 +0000 (19:22 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 10 May 2006 02:22:25 +0000 (19:22 -0700)
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>

No differences found
The core git plumbing