Elgato_dark/gitui
1
0
Fork 0
mirror of https://github.com/gitui-org/gitui synced 2026-05-23 00:48:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update changelog and readme

Browse source
This commit is contained in:
Stephan Dilly 2021-03-02 12:52:02 +01:00
parent 1714fbad49
commit a427874137
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

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

1
README.md
View file

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