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..

On Mon, Apr 13, 2015 at 2:25 AM, Dmitry Moskalchuk <dm@crystax.net> 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:
http://stackoverflow.com/questions/18137918/git-pull-rebase-this-is-a-possibly-dangerous-operation.