summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2f5703c)
raw | patch | inline | side by side (parent: 2f5703c)
author | Junio C Hamano <junkio@cox.net> | |
Thu, 18 Aug 2005 20:00:53 +0000 (13:00 -0700) | ||
committer | Junio 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 | patch | blob | history |
diff --git a/git-rebase-script b/git-rebase-script
index 7b1d4900bd256ee8c1dd70220012be3e77070cc5..5bb3bd97af8019ad31d9278fcfd27e08ca3ce1da 100755 (executable)
--- a/git-rebase-script
+++ b/git-rebase-script
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."