sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00
Code Activity

support merging remote branches into checked out branch

Browse Source
This commit is contained in:
Jesse Duffield
2019-11-17 13:21:38 +11:00
parent 55ff0c0dee
commit 2afbd7ba7f
4 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/gui/keybindings.go
View File

@ -1065,6 +1065,14 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
Handler: gui.handleCheckoutRemoteBranch,
Description: gui.Tr.SLocalize("checkout"),
},
{
ViewName: "branches",
Contexts: []string{"remote-branches"},
Key: 'M',
Modifier: gocui.ModNone,
Handler: gui.handleMergeRemoteBranch,
Description: gui.Tr.SLocalize("mergeIntoCurrentBranch"),
},
{
ViewName: "commits",
Key: gocui.MouseLeft,