X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=525d3a1974d7b38a2f295c0b7c968fee92abdc43;hb=a2faed347de389d6f667a4e98576398db88d1a14;hp=e0d1da716faeec80d347a9b76d5e0c46fd60dd4a;hpb=150d3decb54971a7378fb48d0b6970d3fb50ff95;p=jquery.git

diff --git a/Makefile b/Makefile
index e0d1da7..525d3a1 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,7 @@ ${DIST_DIR}:
 	@@mkdir -p ${DIST_DIR}
 
 init:
-	@@if [ -d .git ]; then git submodule update --init --recursive; fi
+	@@if [ -d .git ]; then git submodule update --init --recursive --merge; fi
 
 jquery: init ${JQ}
 jq: init ${JQ}
@@ -99,4 +99,12 @@ distclean: clean
 	@@echo "Removing submodules"
 	@@rm -rf test/qunit src/sizzle
 
+# update the submodules to the latest at the most logical branch
+pull_submodules:
+	@@git submodule foreach "git pull origin \$$(git branch --no-color --contains \$$(git rev-parse HEAD) | grep -v \( | head -1)"
+	@@git submodule summary
+
+pull: pull_submodules
+	@@git pull ${REMOTE} ${BRANCH}
+
 .PHONY: all jquery lint min init jq clean