Skip to content

Commit

Permalink
fix(changelog): Move --keep-emptied to the correct release.
Browse files Browse the repository at this point in the history
Thanks @scott2000 for catching this.
  • Loading branch information
matts1 committed Jul 3, 2024
1 parent ca4eb60 commit 22584f2
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 22584f2

Please sign in to comment.