Added merge to do fast-forward only in gitconfig