git.asbjorn.biz
/
jquery.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from:
a2faed3
)
Merge when updating submodules on make
author
Carl Fürstenberg
<azatoth@gmail.com>
Thu, 17 Mar 2011 18:50:53 +0000
(19:50 +0100)
committer
Carl Fürstenberg
<azatoth@gmail.com>
Thu, 17 Mar 2011 18:50:53 +0000
(19:50 +0100)
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).
No differences found