Use @pda's (sane) version of git-ff