diff options
| author | David Chen <weichen2000121@gmail.com> | 2020-01-04 08:12:36 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-04 08:12:36 +0000 |
| commit | 86b101c410b0ec2b7eaffcc81f6db44002801b6e (patch) | |
| tree | 8a304ed16128fee08492ff7ef1b51fe94be9da7a | |
| parent | f99a200db0edefd3aa13cb41080759bdfe291f63 (diff) | |
| parent | 96ca7262e4b66e4de7cb8b4859cc2b3117bcffe8 (diff) | |
Merge branch 'master' into custom-keybindings
| -rw-r--r-- | README.md | 8 | ||||
| -rw-r--r-- | docs/keybindings/Keybindings_en.md | 1 | ||||
| -rw-r--r-- | pkg/gui/keybindings.go | 13 | ||||
| -rw-r--r-- | pkg/i18n/english.go | 3 |
4 files changed, 13 insertions, 12 deletions
@@ -46,21 +46,17 @@ sudo port install lazygit ### Ubuntu -Packages for Ubuntu 16.04, 18.04 and 18.10 are available via [Launchpad PPA](https://launchpad.net/~lazygit-team). +Packages for Ubuntu are available via [Launchpad PPA](https://launchpad.net/~lazygit-team). **Release builds** -Built from git tags. Supposed to be more stable. - ```sh sudo add-apt-repository ppa:lazygit-team/release sudo apt-get update sudo apt-get install lazygit ``` -**Daily builds** - -Built from master branch once in 24 hours (or more sometimes). +**Development builds** ```sh sudo add-apt-repository ppa:lazygit-team/daily diff --git a/docs/keybindings/Keybindings_en.md b/docs/keybindings/Keybindings_en.md index 1ad719251..e9c6faf59 100644 --- a/docs/keybindings/Keybindings_en.md +++ b/docs/keybindings/Keybindings_en.md @@ -4,6 +4,7 @@ <pre> <kbd>m</kbd>: view merge/rebase options + <kbd>ctrl+p</kbd>: view custom patch options <kbd>P</kbd>: push <kbd>p</kbd>: pull <kbd>R</kbd>: refresh diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go index 810188bcc..f3c504ddb 100644 --- a/pkg/gui/keybindings.go +++ b/pkg/gui/keybindings.go @@ -423,6 +423,13 @@ func (gui *Gui) GetInitialKeybindings() []*Binding { }, { ViewName: "", + Key: gui.getKey("universal.createPatchOptionsMenu"), + Modifier: gocui.ModNone, + Handler: gui.handleCreatePatchOptionsMenu, + Description: gui.Tr.SLocalize("ViewPatchOptions"), + }, + { + ViewName: "", Key: gui.getKey("universal.pushFiles"), Modifier: gocui.ModNone, Handler: gui.pushFiles, @@ -461,12 +468,6 @@ func (gui *Gui) GetInitialKeybindings() []*Binding { Handler: gui.handleCreateOptionsMenu, }, { - ViewName: "", - Key: gui.getKey("universal.createPatchOptionsMenu"), - Modifier: gocui.ModNone, - Handler: gui.handleCreatePatchOptionsMenu, - }, - { ViewName: "status", Key: gui.getKey("universal.edit"), Modifier: gocui.ModNone, diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index 849594872..55a607090 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -823,6 +823,9 @@ func addEnglish(i18nObject *i18n.Bundle) error { ID: "toggleAddToPatch", Other: "toggle file included in patch", }, &i18n.Message{ + ID: "ViewPatchOptions", + Other: "view custom patch options", + }, &i18n.Message{ ID: "PatchOptionsTitle", Other: "Patch Options", }, &i18n.Message{ |