Stupid typo fix for git rebase.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-18 13:00:53 -07:00 · 2005-08-18 13:00:53 -07:00 · 66e06b6a17
parent 2f5703c3a0
commit 66e06b6a17
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@ -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."