Merge branch 'master' into custom-keybindings

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

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

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"),

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",