From 630de34bf21658b9447af39bc9c6d752b2b1e921 Mon Sep 17 00:00:00 2001
From: justinsb <justinsb@google.com>
Date: Mon, 20 Dec 2021 10:47:10 -0500
Subject: [PATCH] Use "reword" for amending a commit message everywhere

We were inconsistent about "rename" vs "reword" for commits.  reword
is the term used in git itself (for example, in rebase).
---
 README.md                          | 2 +-
 docs/keybindings/Keybindings_en.md | 2 +-
 pkg/i18n/english.go                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 45117e74c..ae17500fb 100644
--- a/README.md
+++ b/README.md
@@ -266,7 +266,7 @@ See the [docs](docs/Custom_Command_Keybindings.md)
 - Easily check out recent branches
 - Scroll through logs/diffs of branches/commits/stash
 - Quick pushing/pulling
-- Squash down and rename commits
+- Squash down and reword commits
 
 ### Resolving merge conflicts
 
diff --git a/docs/keybindings/Keybindings_en.md b/docs/keybindings/Keybindings_en.md
index a86a29c2d..304111d5d 100644
--- a/docs/keybindings/Keybindings_en.md
+++ b/docs/keybindings/Keybindings_en.md
@@ -121,7 +121,7 @@
 <pre>
   <kbd>s</kbd>: squash down
   <kbd>r</kbd>: reword commit
-  <kbd>R</kbd>: rename commit with editor
+  <kbd>R</kbd>: reword commit with editor
   <kbd>g</kbd>: reset to this commit
   <kbd>f</kbd>: fixup commit
   <kbd>F</kbd>: create fixup commit for this commit
diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go
index be81da05c..a35e9bc47 100644
--- a/pkg/i18n/english.go
+++ b/pkg/i18n/english.go
@@ -643,7 +643,7 @@ func englishTranslationSet() TranslationSet {
 		LcMoveUpCommit:                      "move commit up one",
 		LcEditCommit:                        "edit commit",
 		LcAmendToCommit:                     "amend commit with staged changes",
-		LcRenameCommitEditor:                "rename commit with editor",
+		LcRenameCommitEditor:                "reword commit with editor",
 		Error:                               "Error",
 		LcSelectHunk:                        "select hunk",
 		LcNavigateConflicts:                 "navigate conflicts",