From 5f34e9cc073b604d2da3117f826d517afec262b9 Mon Sep 17 00:00:00 2001 From: Stephan Dilly Date: Wed, 29 Sep 2021 18:59:25 +0200 Subject: [PATCH] updated changelog --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bee97323..1ac2ae8d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,9 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased +## Added +- support rebasing branches with conflicts ([#895](https://github.com/extrawurst/gitui/issues/895)) + ## Fixed - appropriate error message when pulling deleted remote branch ([#911](https://github.com/extrawurst/gitui/issues/991)) -- improved color contrast in branches popup for light themes ([#922](https://github.com/extrawurst/gitui/issues/922)) +- improved color contrast in branches popup for light themes [[@Cottser](https://github.com/Cottser)] ([#922](https://github.com/extrawurst/gitui/issues/922)) ## [0.17.1] - 2021-09-10