Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(changelog): Move --keep-emptied to the correct release. #4017

Merged
merged 1 commit into from
Jul 3, 2024
Merged

fix(changelog): Move --keep-emptied to the correct release. #4017

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
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