From 8da9cfc21d93c9fdbc98966dafc785b14061ea94 Mon Sep 17 00:00:00 2001 From: extrawurst Date: Wed, 23 Nov 2022 14:59:19 +0100 Subject: [PATCH] improve help on where to use amend command --- CHANGELOG.md | 1 + src/strings.rs | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 37be8831..a6e93136 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixes * commit msg history ordered the wrong way ([#1445](https://github.com/extrawurst/gitui/issues/1445)) +* improve help documentation for amend cmd ([#1448](https://github.com/extrawurst/gitui/issues/1448)) ## [0.22.1] - 2022-11-22 diff --git a/src/strings.rs b/src/strings.rs index 45ed4cde..9cd52986 100644 --- a/src/strings.rs +++ b/src/strings.rs @@ -426,7 +426,7 @@ pub mod commands { static CMD_GROUP_GENERAL: &str = "-- General --"; static CMD_GROUP_DIFF: &str = "-- Diff --"; static CMD_GROUP_CHANGES: &str = "-- Changes --"; - static CMD_GROUP_COMMIT: &str = "-- Commit --"; + static CMD_GROUP_COMMIT_POPUP: &str = "-- Commit Popup --"; static CMD_GROUP_STASHING: &str = "-- Stashing --"; static CMD_GROUP_STASHES: &str = "-- Stashes --"; static CMD_GROUP_LOG: &str = "-- Log --"; @@ -848,7 +848,7 @@ pub mod commands { key_config.get_hint(key_config.keys.open_commit), ), "open commit popup (available in non-empty stage)", - CMD_GROUP_COMMIT, + CMD_GROUP_GENERAL, ) } pub fn commit_open_editor( @@ -861,7 +861,7 @@ pub mod commands { .get_hint(key_config.keys.open_commit_editor), ), "open commit editor (available in commit popup)", - CMD_GROUP_COMMIT, + CMD_GROUP_COMMIT_POPUP, ) } pub fn commit_next_msg_from_history( @@ -874,7 +874,7 @@ pub mod commands { .get_hint(key_config.keys.commit_history_next), ), "use previous commit message from history", - CMD_GROUP_COMMIT, + CMD_GROUP_COMMIT_POPUP, ) } pub fn commit_enter(key_config: &SharedKeyConfig) -> CommandText { @@ -884,7 +884,7 @@ pub mod commands { key_config.get_hint(key_config.keys.enter), ), "commit (available when commit message is non-empty)", - CMD_GROUP_COMMIT, + CMD_GROUP_COMMIT_POPUP, ) .hide_help() } @@ -895,7 +895,7 @@ pub mod commands { key_config.get_hint(key_config.keys.commit_amend), ), "amend last commit (available in commit popup)", - CMD_GROUP_COMMIT, + CMD_GROUP_COMMIT_POPUP, ) } pub fn edit_item(key_config: &SharedKeyConfig) -> CommandText {