git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge when updating submodules on make
[jquery.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
84816a1
..
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}