diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2018-06-09 19:06:33 +1000 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2018-06-09 19:06:33 +1000 |
commit | 7653ff9a2462482d00283576eb68cbf0c5cbb596 (patch) | |
tree | 3d0930631bcfbf3ca8643b5fad605cd9df6f2b47 /commits_panel.go | |
parent | 4f6ae62e79cca93a6a1868c34c784aa907ec1fcb (diff) |
add support for merging
Diffstat (limited to 'commits_panel.go')
-rw-r--r-- | commits_panel.go | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/commits_panel.go b/commits_panel.go index 76083374e..05ca7eac5 100644 --- a/commits_panel.go +++ b/commits_panel.go @@ -60,8 +60,18 @@ func handleResetToCommit(g *gocui.Gui, commitView *gocui.View) error { }, nil) } +func renderCommitsOptions(g *gocui.Gui) error { + return renderOptionsMap(g, map[string]string{ + "s": "squash down", + "r": "rename", + "g": "reset to this commit", + }) +} + func handleCommitSelect(g *gocui.Gui, v *gocui.View) error { - renderString(g, "options", "s: squash down, r: rename, g: reset to this commit") + if err := renderCommitsOptions(g); err != nil { + return err + } commit, err := getSelectedCommit(g) if err != nil { if err != ErrNoCommits { |