X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-revert.sh;h=de8b5f0f0fbb42e82327670e6916382f6f2d3e47;hb=ae448e3854d8b6e7e37aa88fa3917f5dd97f3210;hp=c19d3a6916ce9c5dccff09f6edfd8b5478b2e834;hpb=2495ca044795f0c5f459789eb29b66f5970096e1;p=git.git

diff --git a/git-revert.sh b/git-revert.sh
index c19d3a69..de8b5f0f 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 || {