go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-01-06 03:53:59 +02:00
Code Issues Releases Activity

Merge branch 'master' into custom-keybindings

Browse Source
This commit is contained in:
David Chen 2020-01-04 08:12:36 +00:00 committed by GitHub
commit 86b101c410
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@ -46,21 +46,17 @@ sudo port install lazygit
### Ubuntu ### 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** **Release builds**
Built from git tags. Supposed to be more stable.
```sh ```sh
sudo add-apt-repository ppa:lazygit-team/release sudo add-apt-repository ppa:lazygit-team/release
sudo apt-get update sudo apt-get update
sudo apt-get install lazygit sudo apt-get install lazygit
``` ```
**Daily builds** **Development builds**
Built from master branch once in 24 hours (or more sometimes).
```sh ```sh
sudo add-apt-repository ppa:lazygit-team/daily sudo add-apt-repository ppa:lazygit-team/daily

1
docs/keybindings/Keybindings_en.md
View File

@ -4,6 +4,7 @@
<pre> <pre>
<kbd>m</kbd>: view merge/rebase options <kbd>m</kbd>: view merge/rebase options
<kbd>ctrl+p</kbd>: view custom patch options
<kbd>P</kbd>: push <kbd>P</kbd>: push
<kbd>p</kbd>: pull <kbd>p</kbd>: pull
<kbd>R</kbd>: refresh <kbd>R</kbd>: refresh

13
pkg/gui/keybindings.go
View File

@ -421,6 +421,13 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
Handler: gui.handleCreateRebaseOptionsMenu, Handler: gui.handleCreateRebaseOptionsMenu,
Description: gui.Tr.SLocalize("ViewMergeRebaseOptions"), Description: gui.Tr.SLocalize("ViewMergeRebaseOptions"),
}, },
{
ViewName: "",
Key: gui.getKey("universal.createPatchOptionsMenu"),
Modifier: gocui.ModNone,
Handler: gui.handleCreatePatchOptionsMenu,
Description: gui.Tr.SLocalize("ViewPatchOptions"),
},
{ {
ViewName: "", ViewName: "",
Key: gui.getKey("universal.pushFiles"), Key: gui.getKey("universal.pushFiles"),
@ -460,12 +467,6 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
Modifier: gocui.ModNone, Modifier: gocui.ModNone,
Handler: gui.handleCreateOptionsMenu, Handler: gui.handleCreateOptionsMenu,
}, },
{
ViewName: "",
Key: gui.getKey("universal.createPatchOptionsMenu"),
Modifier: gocui.ModNone,
Handler: gui.handleCreatePatchOptionsMenu,
},
{ {
ViewName: "status", ViewName: "status",
Key: gui.getKey("universal.edit"), Key: gui.getKey("universal.edit"),

3
pkg/i18n/english.go
View File

@ -822,6 +822,9 @@ func addEnglish(i18nObject *i18n.Bundle) error {
}, &i18n.Message{ }, &i18n.Message{
ID: "toggleAddToPatch", ID: "toggleAddToPatch",
Other: "toggle file included in patch", Other: "toggle file included in patch",
}, &i18n.Message{
ID: "ViewPatchOptions",
Other: "view custom patch options",
}, &i18n.Message{ }, &i18n.Message{
ID: "PatchOptionsTitle", ID: "PatchOptionsTitle",
Other: "Patch Options", Other: "Patch Options",