summaryrefslogtreecommitdiff
path: root/git-rebase-script
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-08-18 20:00:53 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-18 20:00:53 (GMT)
commit66e06b6a17f1074401ad23f4b2a8a146b2900333 (patch)
tree624bb2025dc0c236f8293648d31263d9ff9e67ac /git-rebase-script
parent2f5703c3a09b0d5a851e6846b33a9ed0824f6725 (diff)
downloadgit-66e06b6a17f1074401ad23f4b2a8a146b2900333.zip
git-66e06b6a17f1074401ad23f4b2a8a146b2900333.tar.gz
git-66e06b6a17f1074401ad23f4b2a8a146b2900333.tar.bz2
Stupid typo fix for git rebase.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-rebase-script')
-rwxr-xr-xgit-rebase-script2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase-script b/git-rebase-script
index 7b1d490..5bb3bd9 100755
--- a/git-rebase-script
+++ b/git-rebase-script
@@ -26,7 +26,7 @@ case "$#" in
esac
upstream=`git-rev-parse --verify "$1"` &&
-ours=`git-rev-parse --verify "$ours_symbolic^` || exit
+ours=`git-rev-parse --verify "$ours_symbolic"` || exit
test "$(git-diff-cache --cached "$ours")" = "" ||
die "Your working tree does not match $ours_symbolic."