Skip to content
Permalink
Browse files

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).
  • Loading branch information...
azatoth committed Mar 17, 2011
1 parent 0cf336d commit a2faed347de389d6f667a4e98576398db88d1a14
Showing with 1 addition and 1 deletion.
  1. +1 −1 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}

0 comments on commit a2faed3

Please sign in to comment.
You can’t perform that action at this time.