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

Merge branch 'jesseduffield:master' into feature/keybinding-branch-recent

Browse Source
This commit is contained in:
Sebastian
2023-10-04 09:42:53 +02:00
committed by GitHub
parent a74c6eef40 a3759c65e4
commit 50b49ebeb1
4 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

File diff suppressed because one or more lines are too long

2
docs/Config.md
View File

@ -319,7 +319,7 @@ os:
editPreset: 'vscode' editPreset: 'vscode'
``` ```
Supported presets are `vim`, `nvim`, `nvim-remote`, `emacs`, `nano`, `vscode`, `sublime`, `bbedit`, `kakoune`, `helix`, and `xcode`. In many cases lazygit will be able to guess the right preset from your $(git config core.editor), or an environment variable such as $VISUAL or $EDITOR. Supported presets are `vim`, `nvim`, `nvim-remote`, `emacs`, `nano`, `micro`, `vscode`, `sublime`, `bbedit`, `kakoune`, `helix`, and `xcode`. In many cases lazygit will be able to guess the right preset from your $(git config core.editor), or an environment variable such as $VISUAL or $EDITOR.
`nvim-remote` is an experimental preset for when you have invoked lazygit from within a neovim process, allowing lazygit to open the file from within the parent process rather than spawning a new one. `nvim-remote` is an experimental preset for when you have invoked lazygit from within a neovim process, allowing lazygit to open the file from within the parent process rather than spawning a new one.

1
pkg/config/editor_presets.go
View File

@ -60,6 +60,7 @@ func getPreset(osConfig *OSConfig, guessDefaultEditor func() string) *editPreset
suspend: false, suspend: false,
}, },
"emacs": standardTerminalEditorPreset("emacs"), "emacs": standardTerminalEditorPreset("emacs"),
"micro": standardTerminalEditorPreset("micro"),
"nano": standardTerminalEditorPreset("nano"), "nano": standardTerminalEditorPreset("nano"),
"kakoune": standardTerminalEditorPreset("kak"), "kakoune": standardTerminalEditorPreset("kak"),
"helix": { "helix": {

2
pkg/gui/controllers/helpers/refresh_helper.go
View File

@ -449,9 +449,11 @@ func (self *RefreshHelper) refreshBranches() {
// Need to re-render the commits view because the visualization of local // Need to re-render the commits view because the visualization of local
// branch heads might have changed // branch heads might have changed
self.c.Mutexes().LocalCommitsMutex.Lock()
if err := self.c.Contexts().LocalCommits.HandleRender(); err != nil { if err := self.c.Contexts().LocalCommits.HandleRender(); err != nil {
self.c.Log.Error(err) self.c.Log.Error(err)
} }
self.c.Mutexes().LocalCommitsMutex.Unlock()
self.refreshStatus() self.refreshStatus()
} }