Document the --(no-)edit switch of git-revert and git-cherry-pick

[git.git] / git-revert.sh

diff --git a/git-revert.sh b/git-revert.sh
index dfd914c..5cb02b1 100755 (executable)
--- a/git-revert.sh
+++ b/git-revert.sh
@@ -3,24 +3,26 @@
 # Copyright (c) 2005 Linus Torvalds
 # Copyright (c) 2005 Junio C Hamano
 #
-. git-sh-setup || die "Not a git archive"
+. git-sh-setup
 
 case "$0" in
 *-revert* )
+       test -t 0 && edit=-e
        me=revert ;;
 *-cherry-pick* )
+       edit=
        me=cherry-pick ;;
 * )
-       die "What are ou talking about?" ;;
+       die "What are you talking about?" ;;
 esac
 
 usage () {
        case "$me" in
        cherry-pick)
-               die "usage git $me [-n] [-r] <commit-ish>"
+               die "usage git $me [--edit] [-n] [-r] <commit-ish>"
                ;;
        revert)
-               die "usage git $me [-n] <commit-ish>"
+               die "usage git $me [--edit | --no-edit] [-n] <commit-ish>"
                ;;
        esac
 }
@@ -33,6 +35,12 @@ do
            --no-commi|--no-commit)
                no_commit=t
                ;;
+       -e|--e|--ed|--edi|--edit)
+               edit=-e
+               ;;
+       -n|--n|--no|--no-|--no-e|--no-ed|--no-edi|--no-edit)
+               edit=
+               ;;
        -r|--r|--re|--rep|--repl|--repla|--replay)
                replay=t
                ;;
@@ -112,7 +120,7 @@ cherry-pick)
                q
        }'
        set_author_env=`git-cat-file commit "$commit" |
-       sed -ne "$pick_author_script"`
+       LANG=C LC_ALL=C sed -ne "$pick_author_script"`
        eval "$set_author_env"
        export GIT_AUTHOR_NAME
        export GIT_AUTHOR_EMAIL
@@ -163,7 +171,7 @@ echo >&2 "Finished one $me."
 
 case "$no_commit" in
 '')
-       git-commit -n -F .msg
+       git-commit -n -F .msg $edit
        rm -f .msg
        ;;
 esac