added --no-ff option to gm alias