X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-cherry.sh;h=5e9bd0caf2e1141e3045ea6c3a1f0e9d9285c492;hb=e99fcf96deab45ca81b22948328deb2d8586aa8d;hp=aad2e6171f920c4ad6e83a521837f32d2402da68;hpb=8fc66df237afce0b4318657f166b3583831949f3;p=git.git diff --git a/git-cherry.sh b/git-cherry.sh index aad2e617..5e9bd0ca 100755 --- a/git-cherry.sh +++ b/git-cherry.sh @@ -3,11 +3,8 @@ # Copyright (c) 2005 Junio C Hamano. # -. git-sh-setup || die "Not a git archive." - -usage="usage: $0 "'[-v] [] - - __*__*__*__*__> +USAGE='[-v] []' +LONG_USAGE=' __*__*__*__*__> / fork-point \__+__+__+__+__+__+__+__> @@ -16,8 +13,8 @@ Each commit between the fork-point and is examined, and compared against the change each commit between the fork-point and introduces. If the change seems to be in the upstream, it is shown on the standard output with prefix "+". Otherwise -it is shown with prefix "-". -' +it is shown with prefix "-".' +. git-sh-setup case "$1" in -v) verbose=t; shift ;; esac @@ -35,7 +32,7 @@ case "$#" in 2) upstream=`git-rev-parse --verify "$1"` && ours=`git-rev-parse --verify "$2"` || exit ;; -*) echo >&2 "$usage"; exit 1 ;; +*) usage ;; esac # Note that these list commits in reverse order;