reset with --merge instead of --hard, so the working tree changes are not lost
update pre-commit to warn if a commit directly to master if performed