From a427874137ba852db6ba0fdb976304f84cfe5303 Mon Sep 17 00:00:00 2001 From: Stephan Dilly Date: Tue, 2 Mar 2021 12:52:02 +0100 Subject: [PATCH] update changelog and readme --- CHANGELOG.md | 2 +- README.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a3807d8..94780a62 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ![chars-branch-name](assets/chars_and_branchname.gif) -**pull support (only ff-merge)** +**pull support (ff-merge or conflict-free merge-commit)** ![pull](assets/pull.gif) diff --git a/README.md b/README.md index 175d1f0a..a980eec6 100644 --- a/README.md +++ b/README.md @@ -171,6 +171,7 @@ The key bindings can be customized: See [Key Config](KEY_CONFIG.md) on how to se These are the high level goals before calling out `1.0`: +* rebase merging * upstream branches ([#453](https://github.com/extrawurst/gitui/issues/453)) * merging with conflicts ([#485](https://github.com/extrawurst/gitui/issues/485)) * log search (commit, author, sha) ([#449](https://github.com/extrawurst/gitui/issues/449),[#429](https://github.com/extrawurst/gitui/issues/429))