diff --git a/CHANGELOG.md b/CHANGELOG.md index 9cc374473..922d0aa2a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -82,6 +82,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). * `jj commit` now accepts `--reset-author` option to match `jj describe`. +* `jj squash` now accepts a `--keep-emptied` option to keep the source commit. + ### Fixed bugs * `jj git push` now ignores immutable commits when checking whether a @@ -164,8 +166,6 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). * `jj git push` now can push commits with empty descriptions with the `--allow-empty-description` flag -* `jj squash` now accepts a `--keep-emptied` option to keep the source commit. - ### Fixed bugs * Previously, `jj git push` only made sure that the branch is in the expected