mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-05-11 12:25:47 +02:00
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).
This commit is contained in:
parent
fca2f90f57
commit
630de34bf2
3 changed files with 3 additions and 3 deletions
|
@ -266,7 +266,7 @@ See the [docs](docs/Custom_Command_Keybindings.md)
|
||||||
- Easily check out recent branches
|
- Easily check out recent branches
|
||||||
- Scroll through logs/diffs of branches/commits/stash
|
- Scroll through logs/diffs of branches/commits/stash
|
||||||
- Quick pushing/pulling
|
- Quick pushing/pulling
|
||||||
- Squash down and rename commits
|
- Squash down and reword commits
|
||||||
|
|
||||||
### Resolving merge conflicts
|
### Resolving merge conflicts
|
||||||
|
|
||||||
|
|
|
@ -121,7 +121,7 @@
|
||||||
<pre>
|
<pre>
|
||||||
<kbd>s</kbd>: squash down
|
<kbd>s</kbd>: squash down
|
||||||
<kbd>r</kbd>: reword commit
|
<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>g</kbd>: reset to this commit
|
||||||
<kbd>f</kbd>: fixup commit
|
<kbd>f</kbd>: fixup commit
|
||||||
<kbd>F</kbd>: create fixup commit for this commit
|
<kbd>F</kbd>: create fixup commit for this commit
|
||||||
|
|
|
@ -643,7 +643,7 @@ func englishTranslationSet() TranslationSet {
|
||||||
LcMoveUpCommit: "move commit up one",
|
LcMoveUpCommit: "move commit up one",
|
||||||
LcEditCommit: "edit commit",
|
LcEditCommit: "edit commit",
|
||||||
LcAmendToCommit: "amend commit with staged changes",
|
LcAmendToCommit: "amend commit with staged changes",
|
||||||
LcRenameCommitEditor: "rename commit with editor",
|
LcRenameCommitEditor: "reword commit with editor",
|
||||||
Error: "Error",
|
Error: "Error",
|
||||||
LcSelectHunk: "select hunk",
|
LcSelectHunk: "select hunk",
|
||||||
LcNavigateConflicts: "navigate conflicts",
|
LcNavigateConflicts: "navigate conflicts",
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue