X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=git-rebase--interactive.sh;h=23ded48322bf795b06aa40e4684bc710c8232549;hb=5322ef2006cc93ad76140ff742cd96e74c1ec09b;hp=f96d887d23653019e3387eced2779d50b3f09fa2;hpb=95ad2a65fbb9b7f26669fed9906fe9a1a531810b;p=thirdparty%2Fgit.git

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index f96d887d23..23ded48322 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -703,7 +703,7 @@ first and then run 'git rebase --continue' again."
 					preserve=t
 					for p in $(git rev-list --parents -1 $sha1 | cut -d' ' -s -f2-)
 					do
-						if test -f "$REWRITTEN"/$p -a \( $p != $UPSTREAM -o $sha1 = $first_after_upstream \)
+						if test -f "$REWRITTEN"/$p -a \( $p != $ONTO -o $sha1 = $first_after_upstream \)
 						then
 							preserve=f
 						fi