1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-03-21 21:47:32 +02:00

Merge branch 'master' into https-ask-for-username-password

This commit is contained in:
Mark Kopenga 2018-11-08 10:31:10 +01:00 committed by GitHub
commit 17b4b4cb33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions

@ -14,7 +14,7 @@ Jira? This is the app for you!
[Keybindings](https://github.com/jesseduffield/lazygit/blob/master/docs/Keybindings.md) [Keybindings](https://github.com/jesseduffield/lazygit/blob/master/docs/Keybindings.md)
* [Cool Features](https://github.com/jesseduffield/lazygit#cool-features) * [Cool Features](https://github.com/jesseduffield/lazygit#cool-features)
* [Contributing](https://github.com/jesseduffield/lazygit#contributing) * [Contributing](https://github.com/jesseduffield/lazygit#contributing)
* [Video Tutorial](https://www.youtube.com/watch?v=VDXvbHZYeKY) * [Video Tutorial](https://youtu.be/VDXvbHZYeKY)
* [Twitch Stream](https://www.twitch.tv/jesseduffield) * [Twitch Stream](https://www.twitch.tv/jesseduffield)
## Installation ## Installation
@ -94,7 +94,7 @@ Call `lazygit` in your terminal inside a git repository. If you want, you can
also add an alias for this with `echo "alias lg='lazygit'" >> ~/.zshrc` (or also add an alias for this with `echo "alias lg='lazygit'" >> ~/.zshrc` (or
whichever rc file you're using). whichever rc file you're using).
* Basic video tutorial [here](https://www.youtube.com/watch?v=VDXvbHZYeKY). * Basic video tutorial [here](https://youtu.be/VDXvbHZYeKY).
* List of keybindings * List of keybindings
[here](/docs/Keybindings.md). [here](/docs/Keybindings.md).

@ -180,6 +180,7 @@ func (gui *Gui) layout(g *gocui.Gui) error {
} }
v.Title = gui.Tr.SLocalize("NotEnoughSpace") v.Title = gui.Tr.SLocalize("NotEnoughSpace")
v.Wrap = true v.Wrap = true
g.SetCurrentView(v.Name())
} }
return nil return nil
} }

@ -58,7 +58,7 @@ func (gui *Gui) handleStatusSelect(g *gocui.Gui, v *gocui.View) error {
"Copyright (c) 2018 Jesse Duffield", "Copyright (c) 2018 Jesse Duffield",
"Keybindings: https://github.com/jesseduffield/lazygit/blob/master/docs/Keybindings.md", "Keybindings: https://github.com/jesseduffield/lazygit/blob/master/docs/Keybindings.md",
"Config Options: https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md", "Config Options: https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md",
"Tutorial: https://www.youtube.com/watch?v=VDXvbHZYeKY", "Tutorial: https://youtu.be/VDXvbHZYeKY",
"Raise an Issue: https://github.com/jesseduffield/lazygit/issues", "Raise an Issue: https://github.com/jesseduffield/lazygit/issues",
"Buy Jesse a coffee: https://donorbox.org/lazygit", "Buy Jesse a coffee: https://donorbox.org/lazygit",
}, "\n\n") }, "\n\n")