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

diff --git a/git-revert.sh b/git-revert.sh
index c1aebb15..de8b5f0f 100755
--- a/git-revert.sh
+++ b/git-revert.sh
@@ -3,29 +3,20 @@
 # Copyright (c) 2005 Linus Torvalds
 # Copyright (c) 2005 Junio C Hamano
 #
-. git-sh-setup
 
 case "$0" in
 *-revert* )
 	test -t 0 && edit=-e
-	me=revert ;;
+	me=revert
+	USAGE='[--edit | --no-edit] [-n] <commit-ish>' ;;
 *-cherry-pick* )
 	edit=
-	me=cherry-pick ;;
+	me=cherry-pick
+	USAGE='[--edit] [-n] [-r] <commit-ish>'  ;;
 * )
 	die "What are you talking about?" ;;
 esac
-
-usage () {
-	case "$me" in
-	cherry-pick)
-		die "usage git $me [-n] [-r] <commit-ish>"
-		;;
-	revert)
-		die "usage git $me [-n] <commit-ish>"
-		;;
-	esac
-}
+. git-sh-setup
 
 no_commit= replay=
 while case "$#" in 0) break ;; esac
@@ -38,7 +29,7 @@ do
 	-e|--e|--ed|--edi|--edit)
 		edit=-e
 		;;
-	-n|--n|--no|--no-|--no-e|--no-ed|--no-edi|--no-edit)
+	--n|--no|--no-|--no-e|--no-ed|--no-edi|--no-edit)
 		edit=
 		;;
 	-r|--r|--re|--rep|--repl|--repla|--replay)
@@ -102,6 +93,7 @@ revert)
 cherry-pick)
 	pick_author_script='
 	/^author /{
+		s/'\''/'\''\\'\'\''/g
 		h
 		s/^author \([^<]*\) <[^>]*> .*$/\1/
 		s/'\''/'\''\'\'\''/g
@@ -145,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"