projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'jc/lt-tree-n-cache-tree' into lt/tree-2
[git.git]
/
git-cherry.sh
diff --git
a/git-cherry.sh
b/git-cherry.sh
index
1a62320
..
f0e8831
100755
(executable)
--- a/
git-cherry.sh
+++ b/
git-cherry.sh
@@
-20,7
+20,7
@@
case "$1" in -v) verbose=t; shift ;; esac
case "$#,$1" in
1,*..*)
- upstream=$(expr "
$1" : '\(.*\)\.\.') ours=$(expr "
$1" : '.*\.\.\(.*\)$')
+ upstream=$(expr "
z$1" : 'z\(.*\)\.\.') ours=$(expr "z
$1" : '.*\.\.\(.*\)$')
set x "$upstream" "$ours"
shift ;;
esac