X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=git-pull.sh;h=75c36100a2f858bcf2663d2b4560654787963175;hb=893d340f2c735dc85b9360556ccd46cc0bf27fc0;hp=6afd4e2f4e5859728d748fe51f68e5bfcb934488;hpb=1b1dd23f2d6a707b7077cdf6bc6d4055bd0bfb7d;p=git.git

diff --git a/git-pull.sh b/git-pull.sh
index 6afd4e2f4..75c36100a 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -107,9 +107,9 @@ error_on_no_merge_candidates () {
 }
 
 test true = "$rebase" && {
-	git update-index --refresh &&
-	git diff-files --quiet &&
-	git diff-index --cached --quiet HEAD -- ||
+	git update-index --ignore-submodules --refresh &&
+	git diff-files --ignore-submodules --quiet &&
+	git diff-index --ignore-submodules --cached --quiet HEAD -- ||
 	die "refusing to pull with rebase: your working tree is not up-to-date"
 
 	. git-parse-remote &&