[master] Change gm to always use --no-ff -no-commit