Git option pull.rebase set to true, so pulls always rebase, and put my changes at the tip.