13 Dec
2013
13 Dec
'13
8:12 p.m.
Peter Dimov wrote:
Daniel James wrote:
This manpage contains some useful information, and is a lot shorter than the git-submodule page:
https://www.kernel.org/pub/software/scm/git/docs/gitmodules.html
Especially that 'git submodule update --init --merge' will merge your changes with the update.
By the description, it looks like using --merge in the above procedure will leave libs/bind and libs/smart_ptr on develop, but I'm not sure what it will do to the rest; ...
I can answer my own question now. It inserts unwanted and unnecessary local merge commits in submodules which leaves one baffled for a few minutes when git says "your local branch is ahead of origin by 134 commits". :-)