Subject: Re: [Boost-build] Git usages
From: Vladimir Prus (vladimir.prus_at_[hidden])
Date: 2015-04-13 12:07:43
On 04/13/2015 05:38 PM, Rene Rivera wrote:
> First, I'm likely the one responsible for this thread :-) In my defense.. No one has mentioned what "correct" git usage is. And no, I'm not
> interested in reading a whole book about it. But the the fact that it doesn't seem that there is a sigle, simple, command to do the
> equivalent of "svn update" is disgraceful from a UI design perspective. Anyway..
Yes, this is a common pitfall.
> On Mon, Apr 13, 2015 at 2:25 AM, Dmitry Moskalchuk <dm_at_[hidden] <mailto:dm_at_[hidden]>> wrote:
> On 13/04/15 08:43, Vladimir Prus wrote:
> > - When updating from git, do:
> > git fetch
> > git rebase develop origin/develop
> Just a note: the same could be achieved by "git pull --rebase", or even
> turned to be permanent:
> git config branch.develop.rebase true
> git pull # it will rebase instead of merge now
> Note, however, that rebase is not the same as merge, so it could be
> dangerous in some cases. There are many explanations around why is it
> so; for example, this one:
> Read that.. Doesn't clear anything up. Here's some basic questions.. What should I do if I'm using the Eclipse git integration? Should I
> look into using Mercurial to deal with the git repos as a more sane alternative?
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.
-- 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