Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
revert/cherry-pick: use aggressive merge.
author
Linus Torvalds
<torvalds@osdl.org>
Wed, 10 May 2006 02:22:25 +0000
(19:22 -0700)
committer
Junio C Hamano
<junkio@cox.net>
Wed, 10 May 2006 02:22:25 +0000
(19:22 -0700)
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>
git-revert.sh
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
28cc4ab
)
diff --git
a/git-revert.sh
b/git-revert.sh
index c19d3a6916ce9c5dccff09f6edfd8b5478b2e834..de8b5f0f0fbb42e82327670e6916382f6f2d3e47 100755
(executable)
--- 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 || {