go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-08-08 22:36:49 +02:00
Code Issues Releases Activity

Check if there is any commit to amend and use 'A' instead of 'M' as shortcut.

Browse Source
This commit is contained in:
Kristijan Husak
2018-10-08 21:19:45 +02:00
parent ac65586bd5
commit 190309e5c1
6 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/gui/files_panel.go
View File

@ -217,6 +217,11 @@ func (gui *Gui) handleAmendCommitPress(g *gocui.Gui, filesView *gocui.View) erro
}
title := strings.Title(gui.Tr.SLocalize("AmendLastCommit"))
question := gui.Tr.SLocalize("SureToAmend")
if len(gui.State.Commits) == 0 {
return gui.createErrorPanel(g, gui.Tr.SLocalize("NoCommitToAmend"))
}
return gui.createConfirmationPanel(g, filesView, title, question, func(g *gocui.Gui, v *gocui.View) error {
lastCommitMsg := gui.State.Commits[0].Name
_, err := gui.GitCommand.Commit(lastCommitMsg, true)

4
pkg/gui/keybindings.go
View File

@ -127,7 +127,7 @@ func (gui *Gui) GetKeybindings() []*Binding {
Description: gui.Tr.SLocalize("CommitChanges"),
}, {
ViewName: "files",
Key: 'M',
Key: 'A',
Modifier: gocui.ModNone,
Handler: gui.handleAmendCommitPress,
Description: gui.Tr.SLocalize("AmendLastCommit"),
@ -188,7 +188,7 @@ func (gui *Gui) GetKeybindings() []*Binding {
Description: gui.Tr.SLocalize("stashFiles"),
}, {
ViewName: "files",
Key: 'A',
Key: 'M',
Modifier: gocui.ModNone,
Handler: gui.handleAbortMerge,
Description: gui.Tr.SLocalize("abortMerge"),