pull: make pull.ff=true override merge.ff