diff --git a/README.md b/README.md index b52343fbd..414d18a9b 100644 --- a/README.md +++ b/README.md @@ -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 @@
m: view merge/rebase options + ctrl+p: view custom patch options P: push p: pull R: 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 @@ -421,6 +421,13 @@ func (gui *Gui) GetInitialKeybindings() []*Binding { Handler: gui.handleCreateRebaseOptionsMenu, Description: gui.Tr.SLocalize("ViewMergeRebaseOptions"), }, + { + ViewName: "", + Key: gui.getKey("universal.createPatchOptionsMenu"), + Modifier: gocui.ModNone, + Handler: gui.handleCreatePatchOptionsMenu, + Description: gui.Tr.SLocalize("ViewPatchOptions"), + }, { ViewName: "", Key: gui.getKey("universal.pushFiles"), @@ -460,12 +467,6 @@ func (gui *Gui) GetInitialKeybindings() []*Binding { Modifier: gocui.ModNone, Handler: gui.handleCreateOptionsMenu, }, - { - ViewName: "", - Key: gui.getKey("universal.createPatchOptionsMenu"), - Modifier: gocui.ModNone, - Handler: gui.handleCreatePatchOptionsMenu, - }, { ViewName: "status", Key: gui.getKey("universal.edit"), 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 @@ -822,6 +822,9 @@ func addEnglish(i18nObject *i18n.Bundle) error { }, &i18n.Message{ ID: "toggleAddToPatch", Other: "toggle file included in patch", + }, &i18n.Message{ + ID: "ViewPatchOptions", + Other: "view custom patch options", }, &i18n.Message{ ID: "PatchOptionsTitle", Other: "Patch Options",