Merge when updating submodules on make

[jquery.git] / Makefile

diff --git a/Makefile b/Makefile
index e0d1da7..525d3a1 100644 (file)
--- 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