git.asbjorn.biz / jquery.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0cf336d) | patch
Merge when updating submodules on make
authorCarl Fürstenberg <azatoth@gmail.com>
Thu, 17 Mar 2011 18:50:53 +0000 (19:50 +0100)
committerCarl Fürstenberg <azatoth@gmail.com>
Thu, 17 Mar 2011 18:50:53 +0000 (19:50 +0100)
commita2faed347de389d6f667a4e98576398db88d1a14
tree13cf74ca96de0f039eb8eebaca716287e34e9ac6tree | snapshot
parent0cf336d2c95809ef41d94131e629fd1767f054a0commit | diff
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).
Makefile diff | blob | history
JQuery