Stupid typo fix for git rebase.
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
2f5703c3a0
commit
66e06b6a17
@ -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."
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user