Merge when updating submodules on make

When running make, the submodule update will remove all local changes. Adding flag --rebase or --merge does solve the issue. rebase will probably make it cleaner, but it might stop on conflict, thus --merge will result in fewer (probably none).
2011-03-17 19:50:53 +01:00 · 2011-03-17 19:50:53 +01:00 · a2faed347d
parent 0cf336d2c9
commit a2faed347d
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@ -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}