projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 28cc4ab) | patch
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)
commitd1802851b0c112a065b43e3f83d631f867b7e1ce
treea2916e2e9cd501f87c85dd0c37294fed4e199bedtree | snapshot
parent28cc4ab4224164971a523e8a6c222b5ab2bae27dcommit | 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>
git-revert.sh diff | blob | history
The core git plumbing