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>
Linus Torvalds committed
May 9, 2006 at 19:22 UTC
d1802851b0c112a065b43e3f83d631f867b7e1ce
1 file changed
+1
-1
git-revert.sh
+1
-1
@@ -137,7 +137,7 @@ esac >.msg
137
# $prev and $commit on top of us (when cherry-picking or replaying).
138
139
echo >&2 "First trying simple merge strategy to $me."
140
-git-read-tree -m -u $base $head $next &&
140
+git-read-tree -m -u --aggressive $base $head $next &&
141
result=$(git-write-tree 2>/dev/null) || {
142
echo >&2 "Simple $me fails; trying Automatic $me."
143
git-merge-index -o git-merge-one-file -a || {