![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7ab099d)
raw | patch | inline | side by side (parent: 7ab099d)
| author | freku045@student.liu.se <freku045@student.liu.se> | |
| Tue, 13 Dec 2005 22:30:32 +0000 (23:30 +0100) | ||
| committer | Junio 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>
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 638ff0dbc01cbf87edf1af511d5caac5ee4f1d66..8a5f44aa5e0a732b27a1fde307f77bc810574e7e 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
# Copyright (c) 2005 Junio C Hamano.
#
+USAGE='<upstream> [<head>]'
. git-sh-setup
# Make sure we do not have .dotest
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
# 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