go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-15 01:34:26 +02:00
Code Issues Releases Activity

allow resetting to remote branch

Browse Source
This commit is contained in:
Jesse Duffield
2020-02-16 09:05:15 +11:00
parent 73d8064837
commit 8ca9f93ccf
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/gui/keybindings.go
View File

@ -597,6 +597,14 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
Handler: gui.handleRemoteBranchesEscape, Handler: gui.handleRemoteBranchesEscape,
Description: gui.Tr.SLocalize("ReturnToRemotesList"), Description: gui.Tr.SLocalize("ReturnToRemotesList"),
}, },
{
ViewName: "branches",
Contexts: []string{"remote-branches"},
Key: gui.getKey("commits.viewResetOptions"),
Modifier: gocui.ModNone,
Handler: gui.handleCreateResetToRemoteBranchMenu,
Description: gui.Tr.SLocalize("resetToThisBranch"),
},
{ {
ViewName: "branches", ViewName: "branches",
Contexts: []string{"remotes"}, Contexts: []string{"remotes"},

9
pkg/gui/remote_branches_panel.go
View File

@ -132,3 +132,12 @@ func (gui *Gui) handleSetBranchUpstream(g *gocui.Gui, v *gocui.View) error {
return gui.refreshSidePanels(gui.g) return gui.refreshSidePanels(gui.g)
}, nil) }, nil)
} }
func (gui *Gui) handleCreateResetToRemoteBranchMenu(g *gocui.Gui, v *gocui.View) error {
selectedBranch := gui.getSelectedRemoteBranch()
if selectedBranch == nil {
return nil
}
return gui.createResetMenu(fmt.Sprintf("%s/%s", selectedBranch.RemoteName, selectedBranch.Name))
}