mirror of
https://github.com/martinvonz/jj.git
synced 2024-12-26 05:57:10 +00:00
changelog: list fix for #493 was a bugfix, not a feature
This commit is contained in:
parent
9b59461242
commit
a98ed62519
1 changed files with 5 additions and 5 deletions
10
CHANGELOG.md
10
CHANGELOG.md
|
@ -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.
|
some additional insight into what is happening behind the scenes.
|
||||||
Note: This is not comprehensively supported by all operations yet.
|
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
|
* `jj log`, `jj show`, and `jj obslog` now all support showing relative
|
||||||
timestamps by setting `ui.relative-timestamps = true` in the config file.
|
timestamps by setting `ui.relative-timestamps = true` in the config file.
|
||||||
|
|
||||||
|
@ -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
|
branches. This typically occurred when running in a working copy colocated
|
||||||
with Git (created by running `jj init --git-dir=.`).
|
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 edit root` now fails gracefully.
|
||||||
|
|
||||||
* `jj git import` used to abandon a commit if Git branches and tags referring
|
* `jj git import` used to abandon a commit if Git branches and tags referring
|
||||||
|
|
Loading…
Reference in a new issue