From a98ed62519a84cdd9322fbf7ecce68bee75cbb0b Mon Sep 17 00:00:00 2001 From: Martin von Zweigbergk Date: Sat, 3 Dec 2022 00:02:15 -0800 Subject: [PATCH] changelog: list fix for #493 was a bugfix, not a feature --- CHANGELOG.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 702747767d..fa9f9d6018 100644 --- a/CHANGELOG.md +++ b/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. 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. @@ -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