From 50d863aa1c7e411c6ff3a6b1ef08e84b47ec6732 Mon Sep 17 00:00:00 2001 From: Stephan Dilly Date: Sun, 11 Apr 2021 13:21:24 +0200 Subject: [PATCH] update changelog --- CHANGELOG.md | 3 +++ src/strings.rs | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index af483ae6..046f6f25 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased +### Changed +- ask to pop stash by default (*apply* using `[a]` now) [[@brunogouveia](https://github.com/brunogouveia)] ([#574](https://github.com/extrawurst/gitui/issues/574)) + ### Added - `[w]` key to toggle between staging/workdir [[@terhechte](https://github.com/terhechte)] ([#595](https://github.com/extrawurst/gitui/issues/595)) - view/checkout remote branches ([#617](https://github.com/extrawurst/gitui/issues/617)) diff --git a/src/strings.rs b/src/strings.rs index afca9450..4492cfc0 100644 --- a/src/strings.rs +++ b/src/strings.rs @@ -140,7 +140,7 @@ pub fn confirm_msg_stashdrop( "confirm stash drop?".to_string() } pub fn confirm_msg_stashpop(_key_config: &SharedKeyConfig) -> String { - "The stash will be applied and then remove from the stash list. Confirm stash pop?" + "The stash will be applied and removed from the stash list. Confirm stash pop?" .to_string() } pub fn confirm_msg_resethunk(