From 017701ffac5f35447ce9d25faae2ad5456d04760 Mon Sep 17 00:00:00 2001 From: Stephan Dilly Date: Wed, 12 May 2021 15:29:56 +0200 Subject: [PATCH] update changelog --- CHANGELOG.md | 1 + README.md | 11 +++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a68e07c..40ac8e31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ![warning](assets/commit-msg-length-limit.gif) ## Added +- merging arbitrary branch, commit merges ([#485](https://github.com/extrawurst/gitui/issues/485)) - warning if commit subject line gets too long ([#478](https://github.com/extrawurst/gitui/issues/478)) ## Changed diff --git a/README.md b/README.md index 978c4482..5d71093f 100644 --- a/README.md +++ b/README.md @@ -55,11 +55,11 @@ For a [RustBerlin meetup presentation](https://youtu.be/rpilJV-eIVw?t=5334) ([slides](https://github.com/extrawurst/gitui-presentation)) I compared `lazygit`,`tig` and `gitui` by parsing the entire Linux git repository (which contains over 900k commits): -| | Time | Memory (GB) | Binary (MB) | Freezes | Crashes | -| --------- | ----------- | ----------- | ----------- | --------- | --------- | -| `gitui` | **24 s** ✅ | **0.17** ✅ | 1.4 | **No** ✅ | **No** ✅ | -| `lazygit` | 57 s | 2.6 | 16 | Yes | Sometimes | -| `tig` | 4 m 20 s | 1.3 | **0.6** ✅ | Sometimes | **No** ✅ | +| | Time | Memory (GB) | Binary (MB) | Freezes | Crashes | +| --------- | ---------- | ----------- | ----------- | --------- | --------- | +| `gitui` | **24 s** ✅ | **0.17** ✅ | 1.4 | **No** ✅ | **No** ✅ | +| `lazygit` | 57 s | 2.6 | 16 | Yes | Sometimes | +| `tig` | 4 m 20 s | 1.3 | **0.6** ✅ | Sometimes | **No** ✅ | ## 3. Motivation [Top ▲](#table-of-contents) @@ -71,7 +71,6 @@ Over the last 2 years my go-to GUI tool for this was [fork](https://git-fork.com These are the high level goals before calling out `1.0`: -* 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)) * file history log ([#381](https://github.com/extrawurst/gitui/issues/381)) * more tag support ([#483](https://github.com/extrawurst/gitui/issues/483))