deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge when updating submodules on make

Browse source 
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).
This commit is contained in:
Carl Fürstenberg 2011-03-17 19:50:53 +01:00
parent 0cf336d2c9
commit a2faed347d
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -49,7 +49,7 @@ ${DIST_DIR}:
@@mkdir -p ${DIST_DIR} @@mkdir -p ${DIST_DIR}
init: 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} jquery: init ${JQ}
jq: init ${JQ} jq: init ${JQ}