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

2 files changed, 10 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()
 			},
 		},
 	}
diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go
index 2ca467be1..325896bf7 100644
--- a/pkg/i18n/english.go
+++ b/pkg/i18n/english.go
@@ -948,6 +948,9 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "resetToThisTag",
 			Other: "reset to this tag",
+		}, &i18n.Message{
+			ID:    "resetToUpstream",
+			Other: "reset to the HEAD of the upstream branch",
 		},
 	)
 }