git: always merge with --ff-only

Mainly for `git pull`. I want error message instead of merge commit when
pull on branch with local commits