Subject: Re: [boost] Equivalent of "svn update"?
From: Daniel James (daniel_at_[hidden])
Date: 2013-12-13 15:42:21
On 13 December 2013 20:12, Peter Dimov <lists_at_[hidden]> wrote:
> 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". :-)
I did say that I didn't know if it would work. I guess the best thing
to do is to configure the super project to do whatever it is that you
Boost list run by bdawes at acm.org, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk