changelog update (#556)

+ small renaming

Author: Stephan Dilly

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

assets/char_count.gif

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

assets/chars_and_branchname.gif

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