Victor Seva writes: > git pull --rebase is the missing step there. I have set pull rebase in > ~/.gitconfig [0] > > [pull] > rebase = true > > so git pull --rebase is automatic for me Thanks, Juha