diff options
Diffstat (limited to 'git-revert.sh')
| -rwxr-xr-x | git-revert.sh | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/git-revert.sh b/git-revert.sh index 2bf35d116c..4fd81b6ed6 100755 --- a/git-revert.sh +++ b/git-revert.sh @@ -7,18 +7,20 @@ case "$0" in *-revert* ) test -t 0 && edit=-e + replay= me=revert USAGE='[--edit | --no-edit] [-n] <commit-ish>' ;; *-cherry-pick* ) + replay=t edit= me=cherry-pick - USAGE='[--edit] [-n] [-r] <commit-ish>' ;; + USAGE='[--edit] [-n] [-r] [-x] <commit-ish>' ;; * ) die "What are you talking about?" ;; esac . git-sh-setup -no_commit= replay= +no_commit= while case "$#" in 0) break ;; esac do case "$1" in @@ -32,8 +34,10 @@ do --n|--no|--no-|--no-e|--no-ed|--no-edi|--no-edit) edit= ;; - -r|--r|--re|--rep|--repl|--repla|--replay) - replay=t + -r) + : no-op ;; + -x|--i-really-want-to-expose-my-private-commit-object-name) + replay= ;; -*) usage @@ -121,7 +125,7 @@ cherry-pick) git-cat-file commit $commit | sed -e '1,/^$/d' case "$replay" in '') - echo "(cherry picked from $commit commit)" + echo "(cherry picked from commit $commit)" test "$rev" = "$commit" || echo "(original 'git cherry-pick' arguments: $@)" ;; |