Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
tags. These keywords may be useful in non-colocated Git repositories where
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

further up i mentioned the workspace-config.toml, should we update that too?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll leave this open, depends on whether we land this before a new release.

local and exported `@git` tags can point to different revisions.

* Per-repo configurations are now signed, preventing you from using
configurations created by another user. This means you must now use
`jj config edit` to edit in-repo configs instead of manually specifying the
path.

### Fixed bugs

* `jj metaedit --author-timestamp` twice with the same value no longer
Expand Down
185 changes: 175 additions & 10 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ crossterm = { version = "0.28", default-features = false, features = ["windows"]
datatest-stable = "0.3.3"
digest = "0.10.7"
dunce = "1.0.5"
ed25519-dalek = { version = "3.0.0-pre.1", features = ["alloc", "pkcs8", "rand_core"] }
erased-serde = "0.4.8"
etcetera = "0.10.0"
either = "1.15.0"
Expand Down Expand Up @@ -72,6 +73,7 @@ num_cpus = "1.17.0"
once_cell = "1.21.3"
pest = "2.8.3"
pest_derive = "2.8.3"
pkcs8 = { version = "0.11.0-rc.7", features = ["std"] }
pollster = "0.4.0"
pretty_assertions = "1.4.1"
proc-macro2 = "1.0.96"
Expand Down
1 change: 1 addition & 0 deletions cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ once_cell = { workspace = true }
pest = { workspace = true }
pest_derive = { workspace = true }
pollster = { workspace = true }
prost = { workspace = true }
rayon = { workspace = true }
regex = { workspace = true }
rpassword = { workspace = true }
Expand Down
Loading