Subject: Re: [Boost-build] Git usages
From: Dmitry Moskalchuk (dm_at_[hidden])
Date: 2015-04-13 03:25:09
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:
http://stackoverflow.com/questions/18137918/git-pull-rebase-this-is-a-possibly-dangerous-operation.
-- Dmitry Moskalchuk