X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-pull.sh;h=25adddfddfc0a7e2cc33ea0dc1e1d7a101514972;hb=39d8e271f42e976a61f08a4f7bc2047a682ac532;hp=2c7f432dc04254dcb9906f4d078eb16d195848ca;hpb=dcbf0417453297207c7e61efbf1f38621b1caa3f;p=git.git

diff --git a/git-pull.sh b/git-pull.sh
index 2c7f432dc..25adddfdd 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -171,6 +171,11 @@ case "$merge_head" in
 		echo >&2 "Cannot merge multiple branches into empty head"
 		exit 1
 	fi
+	if test true = "$rebase"
+	then
+		echo >&2 "Cannot rebase onto multiple branches"
+		exit 1
+	fi
 	;;
 esac