X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=git-pull.sh;h=8eb74d45debe7ab2bd2cc9b5ed57b1ba49d94bdb;hb=beb172172f3dc63b4e7ad671e34826fb812281f8;hp=a09a44ec4ce3d82cebc5f972f09e94c7c35dc948;hpb=0a4139b5f283ef5e817afaafd9e7e2a149220cc4;p=git.git

diff --git a/git-pull.sh b/git-pull.sh
index a09a44ec4..8eb74d45d 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -273,6 +273,15 @@ then
 	exit
 fi
 
+if test true = "$rebase"
+then
+	o=$(git show-branch --merge-base $curr_branch $merge_head $oldremoteref)
+	if test "$oldremoteref" = "$o"
+	then
+		unset oldremoteref
+	fi
+fi
+
 merge_name=$(git fmt-merge-msg $log_arg <"$GIT_DIR/FETCH_HEAD") || exit
 case "$rebase" in
 true)