diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2020-01-07 20:12:36 +1100 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-01-07 20:26:01 +1100 |
commit | eb2bfd3848bc5178670380f77b675a27d94d2515 (patch) | |
tree | 7cc71d45667144061a9ced2cc1b9e04afa1a0d45 /pkg/gui | |
parent | adb5c8fe06107c01003c444c4636f19713ea9404 (diff) |
allow hard resetting to upstream branch
Diffstat (limited to 'pkg/gui')
-rw-r--r-- | pkg/gui/files_panel.go | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go index 463db817e..aa2e8592e 100644 --- a/pkg/gui/files_panel.go +++ b/pkg/gui/files_panel.go @@ -604,14 +604,21 @@ func (gui *Gui) handleCreateResetMenu(g *gocui.Gui, v *gocui.View) error { description: gui.Tr.SLocalize("softReset"), command: "git reset --soft HEAD", handler: func() error { - return gui.GitCommand.ResetSoftHead() + return gui.GitCommand.ResetSoft("HEAD") }, }, { description: gui.Tr.SLocalize("hardReset"), command: "git reset --hard HEAD", handler: func() error { - return gui.GitCommand.ResetHardHead() + return gui.GitCommand.ResetHard("HEAD") + }, + }, + { + description: gui.Tr.SLocalize("hardResetUpstream"), + command: "git reset --hard @{upstream}", + handler: func() error { + return gui.GitCommand.ResetHard("@{upstream}") }, }, { @@ -624,7 +631,7 @@ func (gui *Gui) handleCreateResetMenu(g *gocui.Gui, v *gocui.View) error { handleMenuPress := func(index int) error { if err := options[index].handler(); err != nil { - return err + return gui.createErrorPanel(gui.g, err.Error()) } return gui.refreshFiles() |