projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
glossary: explain "master" and "origin"
[git.git]
/
git-revert.sh
diff --git
a/git-revert.sh
b/git-revert.sh
index
c1aebb1
..
2c58706
100755
(executable)
--- a/
git-revert.sh
+++ b/
git-revert.sh
@@
-3,29
+3,20
@@
# Copyright (c) 2005 Linus Torvalds
# Copyright (c) 2005 Junio C Hamano
#
# Copyright (c) 2005 Linus Torvalds
# Copyright (c) 2005 Junio C Hamano
#
-. git-sh-setup
case "$0" in
*-revert* )
test -t 0 && edit=-e
case "$0" in
*-revert* )
test -t 0 && edit=-e
- me=revert ;;
+ me=revert
+ USAGE='[--edit | --no-edit] [-n] <commit-ish>' ;;
*-cherry-pick* )
edit=
*-cherry-pick* )
edit=
- me=cherry-pick ;;
+ me=cherry-pick
+ USAGE='[--edit] [-n] [-r] <commit-ish>' ;;
* )
die "What are you talking about?" ;;
esac
* )
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
no_commit= replay=
while case "$#" in 0) break ;; esac
@@
-38,7
+29,7
@@
do
-e|--e|--ed|--edi|--edit)
edit=-e
;;
-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)
edit=
;;
-r|--r|--re|--rep|--repl|--repla|--replay)
@@
-102,6
+93,7
@@
revert)
cherry-pick)
pick_author_script='
/^author /{
cherry-pick)
pick_author_script='
/^author /{
+ s/'\''/'\''\\'\'\''/g
h
s/^author \([^<]*\) <[^>]*> .*$/\1/
s/'\''/'\''\'\'\''/g
h
s/^author \([^<]*\) <[^>]*> .*$/\1/
s/'\''/'\''\'\'\''/g