diff options
| author | Linus Torvalds <torvalds@osdl.org> | 2006-05-10 04:22:25 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-10 04:22:25 +0200 |
| commit | d1802851b0c112a065b43e3f83d631f867b7e1ce (patch) | |
| tree | a2916e2e9cd501f87c85dd0c37294fed4e199bed | |
| parent | read-cache.c: use xcalloc() not calloc() (diff) | |
| download | git-d1802851b0c112a065b43e3f83d631f867b7e1ce.tar.xz git-d1802851b0c112a065b43e3f83d631f867b7e1ce.zip | |
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-x | git-revert.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-revert.sh b/git-revert.sh index c19d3a6916..de8b5f0f0f 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 || { |