diff options
| author | justinsb <justinsb@google.com> | 2021-12-20 10:47:10 -0500 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2021-12-25 22:34:41 +1100 |
| commit | 630de34bf21658b9447af39bc9c6d752b2b1e921 (patch) | |
| tree | b2d272d8f29556ca0285b468317d893f5e835e9b | |
| parent | fca2f90f57afc729c6a2e7328dff44796f20c96e (diff) | |
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).
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | docs/keybindings/Keybindings_en.md | 2 | ||||
| -rw-r--r-- | pkg/i18n/english.go | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -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", |