Merge branch 'ml/cvsserver'

[thirdparty/git.git] / git-rebase.sh

diff --git a/git-rebase.sh b/git-rebase.sh
index 211bf6896844ddf2cc903c4c8fcf0f021c3d8131..5956f0654e1b344db7893519e309a45aa22ae16f 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -75,7 +75,7 @@ esac
 # 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"