Skip to content

Commit

Permalink
changelog: list fix for jj-vcs#493 was a bugfix, not a feature
Browse files Browse the repository at this point in the history
  • Loading branch information
martinvonz committed Dec 3, 2022
1 parent 9b59461 commit a98ed62
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
some additional insight into what is happening behind the scenes.
Note: This is not comprehensively supported by all operations yet.

* (#493) When exporting branches to Git, we used to fail if some branches could
not be exported (e.g. because Git doesn't allow a branch called `main` and
another branch called `main/sub`). We now print a warning about these branches
instead.

* `jj log`, `jj show`, and `jj obslog` now all support showing relative
timestamps by setting `ui.relative-timestamps = true` in the config file.

Expand All @@ -91,6 +86,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
branches. This typically occurred when running in a working copy colocated
with Git (created by running `jj init --git-dir=.`).

* (#493) When exporting branches to Git, we used to fail if some branches could
not be exported (e.g. because Git doesn't allow a branch called `main` and
another branch called `main/sub`). We now print a warning about these branches
instead.

* `jj edit root` now fails gracefully.

* `jj git import` used to abandon a commit if Git branches and tags referring
Expand Down

0 comments on commit a98ed62

Please sign in to comment.