Stupid typo fix for git rebase.
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
@ -26,7 +26,7 @@ case "$#" in
|
|||||||
esac
|
esac
|
||||||
|
|
||||||
upstream=`git-rev-parse --verify "$1"` &&
|
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")" = "" ||
|
test "$(git-diff-cache --cached "$ours")" = "" ||
|
||||||
die "Your working tree does not match $ours_symbolic."
|
die "Your working tree does not match $ours_symbolic."
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user