Add --no-commit option to make experience more consistent