summaryrefslogtreecommitdiff
path: root/git-rebase.sh
diff options
context:
space:
mode:
authorJason Riedy <ejr@EECS.Berkeley.EDU>2006-02-21 20:56:14 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-02-22 02:25:34 (GMT)
commitd0080b3cdab3a309385ad3fb3b4d2f6a08212985 (patch)
tree15225d6a6507d0327c1c6f1b46d8d8167d769aa0 /git-rebase.sh
parent5508a616631fb41531b638f744bd92c701727014 (diff)
downloadgit-d0080b3cdab3a309385ad3fb3b4d2f6a08212985.zip
git-d0080b3cdab3a309385ad3fb3b4d2f6a08212985.tar.gz
git-d0080b3cdab3a309385ad3fb3b4d2f6a08212985.tar.bz2
Fix typo in git-rebase.sh.
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>
Diffstat (limited to 'git-rebase.sh')
-rwxr-xr-xgit-rebase.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh
index 211bf68..5956f06 100755
--- 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"