summaryrefslogtreecommitdiffstats
path: root/pkg/gui/files_panel.go
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2019-02-19 23:36:29 +1100
committerJesse Duffield <jessedduffield@gmail.com>2019-02-19 23:36:36 +1100
commit0228e250847d042730038281f435b0b21d992c42 (patch)
tree9f15ef6444c6215852a301a3286dcddf8a2b0cb3 /pkg/gui/files_panel.go
parent935f77483443a12ab159e19a958dfdf61a947b36 (diff)
work towards more interactive rebase options
Diffstat (limited to 'pkg/gui/files_panel.go')
-rw-r--r--pkg/gui/files_panel.go13
1 files changed, 13 insertions, 0 deletions
diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go
index 491b931e5..c6f5cd7d5 100644
--- a/pkg/gui/files_panel.go
+++ b/pkg/gui/files_panel.go
@@ -480,3 +480,16 @@ func (gui *Gui) anyFilesWithMergeConflicts() bool {
}
return false
}
+
+func (gui *Gui) handleSoftReset(g *gocui.Gui, v *gocui.View) error {
+ return gui.createConfirmationPanel(g, v, gui.Tr.SLocalize("SoftReset"), gui.Tr.SLocalize("ConfirmSoftReset"), func(g *gocui.Gui, v *gocui.View) error {
+ if err := gui.GitCommand.SoftReset("HEAD^"); err != nil {
+ return gui.createErrorPanel(g, err.Error())
+ }
+
+ if err := gui.refreshCommits(gui.g); err != nil {
+ return err
+ }
+ return gui.refreshFiles()
+ }, nil)
+}