diff --git a/CHANGELOG.md b/CHANGELOG.md index 699f9e440..93fd4a9d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.3.5] - 2021-09-11 + - Added: Merge commits can be rebased by `git move --on-disk`. This uses the same system as `git rebase --rebase-merges`. - Changed (#63): The UI for `git undo` has been changed in various ways. Thanks to @chapati23 for their feedback. You can leave your own feedback here: https://github.com/arxanas/git-branchless/discussions - Changed: Merge-base calculation is now performed using [EdenSCM](https://github.com/facebookexperimental/eden)'s directed acyclic graph crate ([`esl01-dag`](https://crates.io/crates/esl01-dag)), which significantly improves performance on large repositories. diff --git a/Cargo.lock b/Cargo.lock index 7d1eb377f..b9a129b7c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -757,7 +757,7 @@ checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7" [[package]] name = "git-branchless" -version = "0.3.4" +version = "0.3.5" dependencies = [ "anyhow", "assert_cmd", diff --git a/Cargo.toml b/Cargo.toml index ea5119452..6847baf16 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ keywords = ["cli", "git"] license = "GPL-2.0-only" name = "git-branchless" repository = "https://github.com/arxanas/git-branchless" -version = "0.3.4" +version = "0.3.5" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html