diff options
| -rwxr-xr-x | git-rebase-script | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase-script b/git-rebase-script index 7b1d4900bd..5bb3bd97af 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." |