go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-17 01:42:45 +02:00
Code Issues Releases Activity

add mixed option to HEAD resetting, remove @{upstream}

Browse Source
This commit is contained in:
Jesse Duffield
2020-02-16 09:19:08 +11:00
parent f528e12c83
commit 0fe9c15ce8
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
pkg/gui/workspace_reset_options_panel.go
View File

@ -61,6 +61,19 @@ func (gui *Gui) handleCreateResetMenu(g *gocui.Gui, v *gocui.View) error {
return gui.refreshFiles() return gui.refreshFiles()
}, },
}, },
{
displayStrings: []string{
"mixed reset",
red.Sprint("git reset --mixed HEAD"),
},
onPress: func() error {
if err := gui.GitCommand.ResetSoft("HEAD"); err != nil {
return gui.createErrorPanel(gui.g, err.Error())
}
return gui.refreshFiles()
},
},
{ {
displayStrings: []string{ displayStrings: []string{
gui.Tr.SLocalize("hardReset"), gui.Tr.SLocalize("hardReset"),
@ -74,19 +87,6 @@ func (gui *Gui) handleCreateResetMenu(g *gocui.Gui, v *gocui.View) error {
return gui.refreshFiles() return gui.refreshFiles()
}, },
}, },
{
displayStrings: []string{
gui.Tr.SLocalize("hardResetUpstream"),
red.Sprint("git reset --hard @{upstream}"),
},
onPress: func() error {
if err := gui.GitCommand.ResetHard("@{upstream}"); err != nil {
return gui.createErrorPanel(gui.g, err.Error())
}
return gui.refreshSidePanels(gui.g)
},
},
} }
return gui.createMenu("", menuItems, createMenuOptions{showCancel: true}) return gui.createMenu("", menuItems, createMenuOptions{showCancel: true})

3
pkg/i18n/english.go
View File

@ -948,6 +948,9 @@ func addEnglish(i18nObject *i18n.Bundle) error {
}, &i18n.Message{ }, &i18n.Message{
ID: "resetToThisTag", ID: "resetToThisTag",
Other: "reset to this tag", Other: "reset to this tag",
}, &i18n.Message{
ID: "resetToUpstream",
Other: "reset to the HEAD of the upstream branch",
}, },
) )
} }