X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-revert.sh;h=de8b5f0f0fbb42e82327670e6916382f6f2d3e47;hb=74237d6236d7e32f69469ff26df3f3bb3875f523;hp=63d201be1bf810499cfeb7aecbc23ec15e171bb7;hpb=b0d3e9baaa16c805ef941e8f26d55fb23f091ef5;p=git.git

diff --git a/git-revert.sh b/git-revert.sh
index 63d201be..de8b5f0f 100755
--- a/git-revert.sh
+++ b/git-revert.sh
@@ -93,6 +93,7 @@ revert)
 cherry-pick)
 	pick_author_script='
 	/^author /{
+		s/'\''/'\''\\'\'\''/g
 		h
 		s/^author \([^<]*\) <[^>]*> .*$/\1/
 		s/'\''/'\''\'\'\''/g
@@ -136,12 +137,13 @@ 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 || {
-	    echo >&2 "Automatic $me failed.  After fixing it up,"
-	    echo >&2 "you can use \"git commit -F .msg\""
+	    echo >&2 "Automatic $me failed.  After resolving the conflicts,"
+	    echo >&2 "mark the corrected paths with 'git-update-index <paths>'"
+	    echo >&2 "and commit with 'git commit -F .msg'"
 	    case "$me" in
 	    cherry-pick)
 		echo >&2 "You may choose to use the following when making"