From 5ebd8ac7fe83b63c7ecbce3ce24b5cce4fa2a398 Mon Sep 17 00:00:00 2001 From: Sebastian Mangelsen Date: Mon, 2 Oct 2023 18:06:24 +0200 Subject: [PATCH 1/2] commmit - enhance docs for keybinding 'c' for local branch - closes #3030 - mention that it supports '-' - fix documentation and builtin help --- docs/keybindings/Keybindings_en.md | 2 +- pkg/i18n/english.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/keybindings/Keybindings_en.md b/docs/keybindings/Keybindings_en.md index 3c57562f2..e81fb42db 100644 --- a/docs/keybindings/Keybindings_en.md +++ b/docs/keybindings/Keybindings_en.md @@ -141,7 +141,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_
   <c-o>: Copy branch name to clipboard
   i: Show git-flow options
-  <space>: Checkout
+  <space>: Checkout, use '-' for previous
   n: New branch
   o: Create pull request
   O: Create pull request options
diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go
index 15deab925..965382247 100644
--- a/pkg/i18n/english.go
+++ b/pkg/i18n/english.go
@@ -868,7 +868,7 @@ func EnglishTranslationSet() TranslationSet {
 		CantRebaseOntoSelf:                  "You cannot rebase a branch onto itself",
 		CantMergeBranchIntoItself:           "You cannot merge a branch into itself",
 		ForceCheckout:                       "Force checkout",
-		CheckoutByName:                      "Checkout by name",
+		CheckoutByName:                      "Checkout by name, use '-' for previous",
 		NewBranch:                           "New branch",
 		NoBranchesThisRepo:                  "No branches for this repo",
 		CommitWithoutMessageErr:             "You cannot commit without a commit message",

From a74c6eef40ca55f297dcb1226e72f9445071dac4 Mon Sep 17 00:00:00 2001
From: Sebastian Mangelsen 
Date: Wed, 4 Oct 2023 09:41:00 +0200
Subject: [PATCH 2/2] adjust the text to received review comments

---
 docs/keybindings/Keybindings_en.md | 2 +-
 pkg/i18n/english.go                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/keybindings/Keybindings_en.md b/docs/keybindings/Keybindings_en.md
index e81fb42db..535d7f0ab 100644
--- a/docs/keybindings/Keybindings_en.md
+++ b/docs/keybindings/Keybindings_en.md
@@ -141,7 +141,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_
 
   <c-o>: Copy branch name to clipboard
   i: Show git-flow options
-  <space>: Checkout, use '-' for previous
+  <space>: Checkout, enter '-' to switch to last
   n: New branch
   o: Create pull request
   O: Create pull request options
diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go
index 965382247..2d84fdd64 100644
--- a/pkg/i18n/english.go
+++ b/pkg/i18n/english.go
@@ -868,7 +868,7 @@ func EnglishTranslationSet() TranslationSet {
 		CantRebaseOntoSelf:                  "You cannot rebase a branch onto itself",
 		CantMergeBranchIntoItself:           "You cannot merge a branch into itself",
 		ForceCheckout:                       "Force checkout",
-		CheckoutByName:                      "Checkout by name, use '-' for previous",
+		CheckoutByName:                      "Checkout by name, enter '-' to switch to last",
 		NewBranch:                           "New branch",
 		NoBranchesThisRepo:                  "No branches for this repo",
 		CommitWithoutMessageErr:             "You cannot commit without a commit message",