mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-27 12:03:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

revert/cherry-pick: use aggressive merge.

Browse Source 
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>
This commit is contained in:
Linus Torvalds 2006-05-09 19:22:25 -07:00 committed by Junio C Hamano
parent 28cc4ab422
commit d1802851b0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-revert.sh
View File

@ -137,7 +137,7 @@ esac >.msg
# $prev and $commit on top of us (when cherry-picking or replaying). # $prev and $commit on top of us (when cherry-picking or replaying).
echo >&2 "First trying simple merge strategy to $me." 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) || { result=$(git-write-tree 2>/dev/null) || {
echo >&2 "Simple $me fails; trying Automatic $me." echo >&2 "Simple $me fails; trying Automatic $me."
git-merge-index -o git-merge-one-file -a || { git-merge-index -o git-merge-one-file -a || {