diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2019-03-02 18:45:18 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2019-03-02 19:05:21 +1100 |
| commit | 7a170bbccfb5464706694320041567fdf7cd5eff (patch) | |
| tree | 800b44100d087e1f4004245e068d47b2c1540321 /pkg | |
| parent | 8c0ea8f45fde1dfddd23198fcb06ae77468e3a3a (diff) | |
extend cheatsheet generator to contain context based keybindings
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/gui/keybindings.go | 5 | ||||
| -rw-r--r-- | pkg/i18n/english.go | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go index 3e0e3b1d1..eb49fe672 100644 --- a/pkg/gui/keybindings.go +++ b/pkg/gui/keybindings.go @@ -13,7 +13,6 @@ type Binding struct { Key interface{} // FIXME: find out how to get `gocui.Key | rune` Modifier gocui.Modifier Description string - panic bool } // GetDisplayStrings returns the display string of a file @@ -32,10 +31,6 @@ func (b *Binding) GetKey() string { key = int(b.Key.(gocui.Key)) } - if b.panic { - panic(key) - } - // special keys switch key { case 27: diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index 7195c5f0d..79c1e9854 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -311,10 +311,10 @@ func addEnglish(i18nObject *i18n.Bundle) error { Other: "revert commit", // TODO: i18n }, &i18n.Message{ ID: "OnlyRenameTopCommit", - Other: "Can only rename topmost commit from within lazygit. Use shift+R instead", + Other: "Can only reword topmost commit from within lazygit. Use shift+R instead", }, &i18n.Message{ ID: "renameCommit", - Other: "rename commit", + Other: "reword commit", }, &i18n.Message{ ID: "deleteCommit", Other: "delete commit", // TODO: other languages |