changed --no-commit to --no-ff