go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-03 00:57:52 +02:00
Code Issues Releases Activity

support commit message via git editor using shift+C keybinding

Browse Source
This commit is contained in:
Jesse Duffield
2018-08-11 16:55:39 +10:00
parent 0ac306fe2a
commit 1419be1aab
3 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/Keybindings.md
View File

@ -12,6 +12,7 @@
space: toggle staged space: toggle staged
c: commit changes c: commit changes
shift+C: commit using git editor
shift+S: stash files shift+S: stash files
t: add patched (i.e. pick chunks of a file to add) t: add patched (i.e. pick chunks of a file to add)
o: open o: open
@ -47,6 +48,7 @@
esc: close/cancel esc: close/cancel
enter: confirm enter: confirm
tab: enter newline (if editing)
## Resolving Merge Conflicts (Diff Panel): ## Resolving Merge Conflicts (Diff Panel):

8
files_panel.go
View File

@ -186,6 +186,14 @@ func handleCommitPress(g *gocui.Gui, filesView *gocui.View) error {
return nil return nil
} }
func handleCommitEditorPress(g *gocui.Gui, filesView *gocui.View) error {
if len(stagedFiles(state.GitFiles)) == 0 && !state.HasMergeConflicts {
return createErrorPanel(g, "There are no staged files to commit")
}
runSubProcess(g, "git", "commit")
return nil
}
func genericFileOpen(g *gocui.Gui, v *gocui.View, open func(*gocui.Gui, string) (string, error)) error { func genericFileOpen(g *gocui.Gui, v *gocui.View, open func(*gocui.Gui, string) (string, error)) error {
file, err := getSelectedFile(g) file, err := getSelectedFile(g)
if err != nil { if err != nil {

1
keybindings.go
View File

@ -22,6 +22,7 @@ func keybindings(g *gocui.Gui) error {
{ViewName: "", Key: 'p', Modifier: gocui.ModNone, Handler: pullFiles}, {ViewName: "", Key: 'p', Modifier: gocui.ModNone, Handler: pullFiles},
{ViewName: "", Key: 'R', Modifier: gocui.ModNone, Handler: handleRefresh}, {ViewName: "", Key: 'R', Modifier: gocui.ModNone, Handler: handleRefresh},
{ViewName: "files", Key: 'c', Modifier: gocui.ModNone, Handler: handleCommitPress}, {ViewName: "files", Key: 'c', Modifier: gocui.ModNone, Handler: handleCommitPress},
{ViewName: "files", Key: 'C', Modifier: gocui.ModNone, Handler: handleCommitEditorPress},
{ViewName: "files", Key: gocui.KeySpace, Modifier: gocui.ModNone, Handler: handleFilePress}, {ViewName: "files", Key: gocui.KeySpace, Modifier: gocui.ModNone, Handler: handleFilePress},
{ViewName: "files", Key: 'd', Modifier: gocui.ModNone, Handler: handleFileRemove}, {ViewName: "files", Key: 'd', Modifier: gocui.ModNone, Handler: handleFileRemove},
{ViewName: "files", Key: 'm', Modifier: gocui.ModNone, Handler: handleSwitchToMerge}, {ViewName: "files", Key: 'm', Modifier: gocui.ModNone, Handler: handleSwitchToMerge},