diff options
Diffstat (limited to 'pkg/gui/workspace_reset_options_panel.go')
-rw-r--r-- | pkg/gui/workspace_reset_options_panel.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkg/gui/workspace_reset_options_panel.go b/pkg/gui/workspace_reset_options_panel.go index 6cc3f8da0..f4ceb633c 100644 --- a/pkg/gui/workspace_reset_options_panel.go +++ b/pkg/gui/workspace_reset_options_panel.go @@ -63,11 +63,11 @@ func (gui *Gui) handleCreateResetMenu(g *gocui.Gui, v *gocui.View) error { }, { displayStrings: []string{ - gui.Tr.SLocalize("hardReset"), - red.Sprint("git reset --hard HEAD"), + "mixed reset", + red.Sprint("git reset --mixed HEAD"), }, onPress: func() error { - if err := gui.GitCommand.ResetHard("HEAD"); err != nil { + if err := gui.GitCommand.ResetSoft("HEAD"); err != nil { return gui.createErrorPanel(gui.g, err.Error()) } @@ -76,15 +76,15 @@ func (gui *Gui) handleCreateResetMenu(g *gocui.Gui, v *gocui.View) error { }, { displayStrings: []string{ - gui.Tr.SLocalize("hardResetUpstream"), - red.Sprint("git reset --hard @{upstream}"), + gui.Tr.SLocalize("hardReset"), + red.Sprint("git reset --hard HEAD"), }, onPress: func() error { - if err := gui.GitCommand.ResetHard("@{upstream}"); err != nil { + if err := gui.GitCommand.ResetHard("HEAD"); err != nil { return gui.createErrorPanel(gui.g, err.Error()) } - return gui.refreshSidePanels(gui.g) + return gui.refreshFiles() }, }, } |