update .gitconfig >> merge --no-ff / pull with rebase