update changelog

Stephan Dilly · Stephan Dilly · commit 50d863aa1c7e · 2021-04-11T13:21:24.000+02:00
diff --git 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
@@ -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(

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ pub fn confirm_msg_stashdrop(`
`140`	`140`	`"confirm stash drop?".to_string()`
`141`	`141`	`}`
`142`	`142`	`pub fn confirm_msg_stashpop(_key_config: &SharedKeyConfig) -> String {`
`143`		`- "The stash will be applied and then remove from the stash list. Confirm stash pop?"`
	`143`	`+ "The stash will be applied and removed from the stash list. Confirm stash pop?"`
`144`	`144`	`.to_string()`
`145`	`145`	`}`
`146`	`146`	`pub fn confirm_msg_resethunk(`