# 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
}
--no-commi|--no-commit)
no_commit=t
;;
+ -e|--e|--ed|--edi|--edit)
+ edit=-e
+ ;;
+ --n|--no|--no-|--no-e|--no-ed|--no-edi|--no-edit)
+ edit=
+ ;;
-r|--r|--re|--rep|--repl|--repla|--replay)
replay=t
;;
case "$no_commit" in
'')
- git-commit -n -F .msg
+ git-commit -n -F .msg $edit
rm -f .msg
;;
esac