alias pl = pull --no-ff

the pull.ff = only git config option doesn't appear to do anything, but
if merge.ff = only is set, it can't even be overridden by doing merge
--no-ff!?