From d1802851b0c112a065b43e3f83d631f867b7e1ce Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Tue, 9 May 2006 19:22:25 -0700 Subject: [PATCH] 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 --- git-revert.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-revert.sh b/git-revert.sh index c19d3a69..de8b5f0f 100755 --- a/git-revert.sh +++ b/git-revert.sh @@ -137,7 +137,7 @@ esac >.msg # $prev and $commit on top of us (when cherry-picking or replaying). echo >&2 "First trying simple merge strategy to $me." -git-read-tree -m -u $base $head $next && +git-read-tree -m -u --aggressive $base $head $next && result=$(git-write-tree 2>/dev/null) || { echo >&2 "Simple $me fails; trying Automatic $me." git-merge-index -o git-merge-one-file -a || { -- 2.11.0