From: Junio C Hamano Date: Thu, 18 Aug 2005 20:00:53 +0000 (-0700) Subject: Stupid typo fix for git rebase. X-Git-Tag: v0.99.5~12^2 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=66e06b6a17f1074401ad23f4b2a8a146b2900333;p=git.git Stupid typo fix for git rebase. Signed-off-by: Junio C Hamano --- diff --git a/git-rebase-script b/git-rebase-script index 7b1d4900b..5bb3bd97a 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."