From 0fe9c15ce8566b28516df626b3df0e4bc62e840a Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Sun, 16 Feb 2020 09:19:08 +1100
Subject: [PATCH] add mixed option to HEAD resetting, remove @{upstream}

---
 pkg/gui/workspace_reset_options_panel.go | 26 ++++++++++++------------
 pkg/i18n/english.go                      |  3 +++
 2 files changed, 16 insertions(+), 13 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
@@ -61,6 +61,19 @@ func (gui *Gui) handleCreateResetMenu(g *gocui.Gui, v *gocui.View) error {
 				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{
 				gui.Tr.SLocalize("hardReset"),
@@ -74,19 +87,6 @@ func (gui *Gui) handleCreateResetMenu(g *gocui.Gui, v *gocui.View) error {
 				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})
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",
 		},
 	)
 }