Merge branch 'jk/reset-to-break-a-commit-doc'