aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 84816a19e..525d3a197 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}