gitweb: start to generate PATH_INFO URLs.

diff --git a/git-revert.sh b/git-revert.sh
index c19d3a6916ce9c5dccff09f6edfd8b5478b2e834..2bf35d116c2141a1750a0ca0bd8f7297e0c237b6 100755 (executable)
--- a/git-revert.sh
+++ b/git-revert.sh
@@ -84,7 +84,7 @@ revert)
                s/^[^ ]* /Revert "/
                s/$/"/'
        echo
-       echo "This reverts $commit commit."
+       echo "This reverts commit $commit."
        test "$rev" = "$commit" ||
        echo "(original 'git revert' arguments: $@)"
        base=$commit next=$prev
@@ -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 || {