diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-10-05 17:54:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-05 17:54:14 -0700 |
| commit | abd6970acad5d758f48c13f7420367ae8216038e (patch) | |
| tree | f81f2768a8a29255d7ac47a05a9924f40f4eb6b3 /git-revert.sh | |
| parent | bc108f63dad7a5f6d95418cb78a587f5f570eae6 (diff) | |
| download | git-abd6970acad5d758f48c13f7420367ae8216038e.tar.gz git-abd6970acad5d758f48c13f7420367ae8216038e.tar.xz | |
cherry-pick: make -r the default
And introduce -x to expose (possibly) private commit object name
for people who cherry-pick between public branches.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-revert.sh')
| -rwxr-xr-x | git-revert.sh | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/git-revert.sh b/git-revert.sh index 2bf35d116..0784f74c1 100755 --- a/git-revert.sh +++ b/git-revert.sh @@ -12,13 +12,13 @@ case "$0" in *-cherry-pick* ) 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= replay=t while case "$#" in 0) break ;; esac do case "$1" in @@ -32,8 +32,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 +123,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: $@)" ;; |