summaryrefslogtreecommitdiffstats
path: root/git-revert.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-25 16:35:20 -0800
committerJunio C Hamano <junkio@cox.net>2005-11-25 16:35:20 -0800
commit93dcab2937624ebb97f91807576cddb242a55a46 (patch)
tree8d16464f16866a7f215401a95f8bdaa124799d49 /git-revert.sh
parentMerge branch 'master' (diff)
parentgit-sh-setup: move the repository check to a core program. (diff)
downloadgit-0.99.9k.tar.gz
git-0.99.9k.zip
GIT 0.99.9kv0.99.9k
This is not 1.0rc4 yet, but to push the recent fixes out. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-revert.sh')
-rwxr-xr-xgit-revert.sh14
1 files changed, 11 insertions, 3 deletions
diff --git a/git-revert.sh b/git-revert.sh
index 4154fe0d15..c1aebb159c 100755
--- a/git-revert.sh
+++ b/git-revert.sh
@@ -3,15 +3,17 @@
# 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 () {
@@ -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
;;
@@ -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