Add --no-ff to gpl

I want not to create a merge commit.