diff --git a/git-cherry.sh b/git-cherry.sh --- a/git-cherry.sh +++ b/git-cherry.sh @@ -5,11 +5,11 @@ . git-sh-setup || die "Not a git archive." -usage="usage: $0 "'[-v] [] +usage="usage: $0 "'[-v] [] [] __*__*__*__*__> / - fork-point + fork-point (or ) \__+__+__+__+__+__+__+__> Each commit between the fork-point and is examined, and @@ -40,7 +40,8 @@ esac # Note that these list commits in reverse order; # not that the order in inup matters... -inup=`git-rev-list ^$ours $upstream` && +[ -z "$base" ] && base=$ours +inup=`git-rev-list ^$base $upstream` && ours=`git-rev-list $ours ^$upstream` || exit tmp=.cherry-tmp$$