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.

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

changelog: minor copy edits #3211

Merged
merged 1 commit into from
Mar 4, 2024
Merged
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* `jj next/prev` now infer `--edit` when you're already editing a non-head
commit (a commit with children).

* Built-in pager based on [minus](https://github.com/arijit79/minus/)
* A new built-in pager named `:builtin` is available on all platforms,
implemented with [minus](https://github.com/arijit79/minus/)

* Set config `ui.log-synthetic-elided-nodes = true` to make `jj log` include
synthetic nodes in the graph where some revisions were elided
Expand Down Expand Up @@ -89,7 +90,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* On Windows, symlinks in the repo are now materialized as regular files in the
working copy (instead of resulting in a crash).

* On Windows, the pager will now be the built-in instead of disabled.
* On Windows, the `:builtin` pager is now used by default, rather than being
disabled entirely.

* Auto-rebase now preserves the shape of history even for merge commits where
one parent is an ancestor of another.
Expand Down