gitconfig: rebase after pull, default --no-ff merges