git-cherry: Usage string clean-up, use the 'usage' function
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
6cf6193b45
commit
43a95cfbc9
@ -3,11 +3,8 @@
|
|||||||
# Copyright (c) 2005 Junio C Hamano.
|
# Copyright (c) 2005 Junio C Hamano.
|
||||||
#
|
#
|
||||||
|
|
||||||
. git-sh-setup
|
USAGE='[-v] <upstream> [<head>]'
|
||||||
|
LONG_USAGE=' __*__*__*__*__> <upstream>
|
||||||
usage="usage: $0 "'[-v] <upstream> [<head>]
|
|
||||||
|
|
||||||
__*__*__*__*__> <upstream>
|
|
||||||
/
|
/
|
||||||
fork-point
|
fork-point
|
||||||
\__+__+__+__+__+__+__+__> <head>
|
\__+__+__+__+__+__+__+__> <head>
|
||||||
@ -16,8 +13,8 @@ Each commit between the fork-point and <head> is examined, and
|
|||||||
compared against the change each commit between the fork-point and
|
compared against the change each commit between the fork-point and
|
||||||
<upstream> introduces. If the change seems to be in the upstream,
|
<upstream> introduces. If the change seems to be in the upstream,
|
||||||
it is shown on the standard output with prefix "+". Otherwise
|
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
|
case "$1" in -v) verbose=t; shift ;; esac
|
||||||
|
|
||||||
@ -35,7 +32,7 @@ case "$#" in
|
|||||||
2) upstream=`git-rev-parse --verify "$1"` &&
|
2) upstream=`git-rev-parse --verify "$1"` &&
|
||||||
ours=`git-rev-parse --verify "$2"` || exit
|
ours=`git-rev-parse --verify "$2"` || exit
|
||||||
;;
|
;;
|
||||||
*) echo >&2 "$usage"; exit 1 ;;
|
*) usage ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
# Note that these list commits in reverse order;
|
# Note that these list commits in reverse order;
|
||||||
|
Loading…
Reference in New Issue
Block a user