git: added ff options for merge and pull aliases