summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5508a61)
raw | patch | inline | side by side (parent: 5508a61)
author | Jason Riedy <ejr@EECS.Berkeley.EDU> | |
Tue, 21 Feb 2006 20:56:14 +0000 (12:56 -0800) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Wed, 22 Feb 2006 02:25:34 +0000 (18:25 -0800) |
s/upsteram/upstream in git-rebase.sh.
Signed-off-by: Jason Riedy <ejr@cs.berkeley.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Jason Riedy <ejr@cs.berkeley.edu>
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 211bf6896844ddf2cc903c4c8fcf0f021c3d8131..5956f0654e1b344db7893519e309a45aa22ae16f 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
# The upstream head must be given. Make sure it is valid.
upstream_name="$1"
upstream=`git rev-parse --verify "${upstream_name}^0"` ||
- die "invalid upsteram $upstream_name"
+ die "invalid upstream $upstream_name"
# If a hook exists, give it a chance to interrupt
if test -x "$GIT_DIR/hooks/pre-rebase"