From 66e06b6a17f1074401ad23f4b2a8a146b2900333 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 18 Aug 2005 13:00:53 -0700 Subject: [PATCH] Stupid typo fix for git rebase. Signed-off-by: Junio C Hamano --- git-rebase-script | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-rebase-script b/git-rebase-script index 7b1d4900..5bb3bd97 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." -- 2.11.0