Stupid typo fix for git rebase.
authorJunio C Hamano <junkio@cox.net>
Thu, 18 Aug 2005 20:00:53 +0000 (13:00 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 18 Aug 2005 20:00:53 +0000 (13:00 -0700)
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-rebase-script

index 7b1d490..5bb3bd9 100755 (executable)
@@ -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."