зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
28cc4ab422
Коммит
d1802851b0
|
@ -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 || {
|
||||
|
|
Загрузка…
Ссылка в новой задаче