projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge with gitk --parents change.
[git.git]
/
git-cherry
diff --git
a/git-cherry
b/git-cherry
index
f14f017
..
e186363
100755
(executable)
--- a/
git-cherry
+++ b/
git-cherry
@@
-5,7
+5,7
@@
. git-sh-setup-script || die "Not a git archive."
. git-sh-setup-script || die "Not a git archive."
-usage="usage: $0 "'<upstream> [<head>]
+usage="usage: $0 "'
[-v]
<upstream> [<head>]
__*__*__*__*__> <upstream>
/
__*__*__*__*__> <upstream>
/
@@
-29,6
+29,8
@@
The output is intended to be used as:
done
'
done
'
+case "$1" in -v) verbose=t; shift ;; esac
+
case "$#,$1" in
1,*..*)
upstream=$(expr "$1" : '\(.*\)\.\.') ours=$(expr "$1" : '.*\.\.\(.*\)$')
case "$#,$1" in
1,*..*)
upstream=$(expr "$1" : '\(.*\)\.\.') ours=$(expr "$1" : '.*\.\.\(.*\)$')
@@
-83,6
+85,10
@@
do
else
sign=+
fi
else
sign=+
fi
+ case "$verbose" in
+ t)
+ c=$(git-rev-list --pretty=oneline --max-count=1 $c)
+ esac
case "$O" in
'') O="$sign $c" ;;
*) O="$sign $c$LF$O" ;;
case "$O" in
'') O="$sign $c" ;;
*) O="$sign $c$LF$O" ;;