projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d180285) | 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>
Wed, 10 May 2006 02:23:23 +0000 (19:23 -0700)
commit8d7a397aab561d3782f531e733b617e0e211f04a
tree299591f8e60cda26aa1219e280eb3f4030867c1etree | snapshot
parentd1802851b0c112a065b43e3f83d631f867b7e1cecommit | 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