diff --git a/CHANGELOG.md b/CHANGELOG.md index b39ab386dc..0a3807d886 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,15 +7,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased +**more info in commit popup** + +![chars-branch-name](assets/chars_and_branchname.gif) + +**pull support (only ff-merge)** + +![pull](assets/pull.gif) + ### Breaking Change - MacOS config directory now uses `~/.config/gitui` [[@remique](https://github.com/remique)] ([#317](https://github.com/extrawurst/gitui/issues/317)) ### Added -- support smoother left/right toggle for commit details ([#418](https://github.com/extrawurst/gitui/issues/418)) -- support *force push* command [[@WizardOhio24](https://github.com/WizardOhio24)] ([#274](https://github.com/extrawurst/gitui/issues/274)) +- support for pull (fetch + ff-only merge) ([#319](https://github.com/extrawurst/gitui/issues/319)) - show used char count in input texts ([#466](https://github.com/extrawurst/gitui/issues/466)) - -![charcount](assets/char_count.gif) +- support smoother left/right toggle/keys for commit details ([#418](https://github.com/extrawurst/gitui/issues/418)) +- support *force push* command [[@WizardOhio24](https://github.com/WizardOhio24)] ([#274](https://github.com/extrawurst/gitui/issues/274)) ### Fixed - don't close branchlist every time ([#550](https://github.com/extrawurst/gitui/issues/550)) diff --git a/assets/char_count.gif b/assets/char_count.gif deleted file mode 100644 index 36c96a6515..0000000000 Binary files a/assets/char_count.gif and /dev/null differ diff --git a/assets/chars_and_branchname.gif b/assets/chars_and_branchname.gif new file mode 100644 index 0000000000..70295520f1 Binary files /dev/null and b/assets/chars_and_branchname.gif differ diff --git a/assets/pull.gif b/assets/pull.gif new file mode 100644 index 0000000000..eb66c4b7bf Binary files /dev/null and b/assets/pull.gif differ diff --git a/src/components/pull.rs b/src/components/pull.rs index f4a0a0a3c5..d7d6cc581c 100644 --- a/src/components/pull.rs +++ b/src/components/pull.rs @@ -185,7 +185,7 @@ impl DrawableComponent for PullComponent { .block( Block::default() .title(Span::styled( - strings::FETCH_POPUP_MSG, + strings::PULL_POPUP_MSG, self.theme.title(true), )) .borders(Borders::ALL) diff --git a/src/strings.rs b/src/strings.rs index 3f3c880802..6fb24e09e3 100644 --- a/src/strings.rs +++ b/src/strings.rs @@ -6,7 +6,7 @@ pub mod order { pub static PUSH_POPUP_MSG: &str = "Push"; pub static FORCE_PUSH_POPUP_MSG: &str = "Force Push"; -pub static FETCH_POPUP_MSG: &str = "Fetch"; +pub static PULL_POPUP_MSG: &str = "Pull"; pub static PUSH_POPUP_PROGRESS_NONE: &str = "preparing..."; pub static PUSH_POPUP_STATES_ADDING: &str = "adding objects (1/3)"; pub static PUSH_POPUP_STATES_DELTAS: &str = "deltas (2/3)";