Added no-ff and no-commit options