Subject: Re: [Boost-build] Git usages
From: Vladimir Prus (vladimir.prus_at_[hidden])
Date: 2015-04-14 04:20:53
On 04/14/2015 02:04 AM, Rene Rivera wrote:
> If you're using egit, you should be able to right-click project in project navigator, pick Team->Fetch From Upstream, and
> then pick Team->Rebase and select origin/develop.
> I realized that doesn't help, sorry :-( As most times I update BB from a super project that isn't Boost. And I do it with a script that has
> git pull
> git submodule init
> git submodule foreach git pull
> Which I need so that the many submodules don't stray from the branch they are on and become detached. And BB is just another submodule. So
> it would be a PITA to do something special for BB. Gods why is git so horrible at this :-\ More than two years of being forced to use git
> and the cons are a magnitude larger than the pros.
Try going to 'build' repository, and doing this:
git config pull.rebase true
You'd need to redo this upon fresh clone.
-- Vladimir Prus http://vladimirprus.com
Boost-Build list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk