projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7ab099d)
git-rebase: Usage string clean-up, emit usage string at incorrect invocation
authorfreku045@student.liu.se <freku045@student.liu.se>
Tue, 13 Dec 2005 22:30:32 +0000 (23:30 +0100)
committerJunio C Hamano <junkio@cox.net>
Wed, 14 Dec 2005 10:53:44 +0000 (02:53 -0800)
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-rebase.sh patch | blob | history

diff --git a/git-rebase.sh b/git-rebase.sh
index 638ff0d..8a5f44a 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -3,6 +3,7 @@
 # Copyright (c) 2005 Junio C Hamano.
 #
 
+USAGE='<upstream> [<head>]'
 . git-sh-setup
 
 # Make sure we do not have .dotest
@@ -19,7 +20,7 @@ you still have something valuable there.'
 fi
 
 # The other head is given.  Make sure it is valid.
-other=$(git-rev-parse --verify "$1^0") || exit
+other=$(git-rev-parse --verify "$1^0") || usage
 
 # Make sure we have HEAD that is valid.
 head=$(git-rev-parse --verify "HEAD^0") || exit
@@ -36,7 +37,7 @@ esac
 # If the branch to rebase is given, first switch to it.
 case "$#" in
 2)
-       git-checkout "$2" || exit
+       git-checkout "$2" || usage
 esac
 
 # If the HEAD is a proper descendant of $other, we do not even need
The core git plumbing