Set default: pull.ff = true.
Merge branch 'trial-git-pullff' into trial