Only do fast-forward merges, even when doing git pull