update changelog and readme

Author: Stephan Dilly

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)
 

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))