Teach git-pull about --[no-]ff, --no-squash and --commit