aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@osdl.org>2006-05-09 19:22:25 -0700
committerJunio C Hamano <junkio@cox.net>2006-05-09 19:22:25 -0700
commitd1802851b0c112a065b43e3f83d631f867b7e1ce (patch)
treea2916e2e9cd501f87c85dd0c37294fed4e199bed
parent28cc4ab4224164971a523e8a6c222b5ab2bae27d (diff)
downloadgit-d1802851b0c112a065b43e3f83d631f867b7e1ce.tar.gz
git-d1802851b0c112a065b43e3f83d631f867b7e1ce.tar.xz
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>
-rwxr-xr-xgit-revert.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-revert.sh b/git-revert.sh
index c19d3a691..de8b5f0f0 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 || {