Added Merge keybind in tag submenu, closes #1315

docs/keybindings/Keybindings_en.md

@@ -349,6 +349,7 @@ If you would instead like to start an interactive rebase from the selected commi
 | `` d `` | Delete | View delete options for local/remote tag. |
 | `` P `` | Push tag | Push the selected tag to a remote. You'll be prompted to select a remote. |
 | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
+| `` M `` | Merge | Merge selected branch into currently checked out branch. |
 | `` <enter> `` | View commits | |
 | `` w `` | View worktree options | |
 | `` / `` | Filter the current view by text | |

docs/keybindings/Keybindings_ja.md

@@ -183,6 +183,7 @@ If you would instead like to start an interactive rebase from the selected commi
 | `` d `` | Delete | View delete options for local/remote tag. |
 | `` P `` | タグをpush | Push the selected tag to a remote. You'll be prompted to select a remote. |
 | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
+| `` M `` | 現在のブランチにマージ | Merge selected branch into currently checked out branch. |
 | `` <enter> `` | コミットを閲覧 | |
 | `` w `` | View worktree options | |
 | `` / `` | Filter the current view by text | |

docs/keybindings/Keybindings_ko.md

@@ -322,6 +322,7 @@ If you would instead like to start an interactive rebase from the selected commi
 | `` d `` | Delete | View delete options for local/remote tag. |
 | `` P `` | 태그를 push | Push the selected tag to a remote. You'll be prompted to select a remote. |
 | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
+| `` M `` | 현재 브랜치에 병합 | Merge selected branch into currently checked out branch. |
 | `` <enter> `` | 커밋 보기 | |
 | `` w `` | View worktree options | |
 | `` / `` | Filter the current view by text | |

docs/keybindings/Keybindings_nl.md

@@ -349,6 +349,7 @@ If you would instead like to start an interactive rebase from the selected commi
 | `` d `` | Delete | View delete options for local/remote tag. |
 | `` P `` | Push tag | Push the selected tag to a remote. You'll be prompted to select a remote. |
 | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
+| `` M `` | Merge in met huidige checked out branch | Merge selected branch into currently checked out branch. |
 | `` <enter> `` | Bekijk commits | |
 | `` w `` | View worktree options | |
 | `` / `` | Filter the current view by text | |

docs/keybindings/Keybindings_pl.md

@@ -330,6 +330,7 @@ Jeśli chcesz zamiast tego rozpocząć interaktywny rebase od wybranego commita,
 | `` n `` | Nowy tag | Utwórz nowy tag z bieżącego commita. Zostaniesz poproszony o wprowadzenie nazwy tagu i opcjonalnego opisu. |
 | `` d `` | Usuń | Wyświetl opcje usuwania lokalnego/odległego tagu. |
 | `` P `` | Wyślij tag | Wyślij wybrany tag do zdalnego. Zostaniesz poproszony o wybranie zdalnego. |
+| `` M `` | Scal do obecnej gałęzi | Merge selected branch into currently checked out branch. |
 | `` g `` | Reset | Wyświetl opcje resetu (miękki/mieszany/twardy) do wybranego elementu. |
 | `` <enter> `` | Pokaż commity | |
 | `` w `` | Zobacz opcje drzewa pracy | |

docs/keybindings/Keybindings_ru.md

@@ -288,6 +288,7 @@ If you would instead like to start an interactive rebase from the selected commi
 | `` d `` | Delete | View delete options for local/remote tag. |
 | `` P `` | Отправить тег | Push the selected tag to a remote. You'll be prompted to select a remote. |
 | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
+| `` M `` | Слияние с текущей переключённой веткой | Merge selected branch into currently checked out branch. |
 | `` <enter> `` | Просмотреть коммиты | |
 | `` w `` | View worktree options | |
 | `` / `` | Filter the current view by text | |

docs/keybindings/Keybindings_zh-CN.md

@@ -248,6 +248,7 @@ If you would instead like to start an interactive rebase from the selected commi
 | `` d `` | Delete | View delete options for local/remote tag. |
 | `` P `` | 推送标签 | Push the selected tag to a remote. You'll be prompted to select a remote. |
 | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
+| `` M `` | 合并到当前检出的分支 | Merge selected branch into currently checked out branch. |
 | `` <enter> `` | 查看提交 | |
 | `` w `` | View worktree options | |
 | `` / `` | Filter the current view by text | |

docs/keybindings/Keybindings_zh-TW.md

@@ -284,6 +284,7 @@ If you would instead like to start an interactive rebase from the selected commi
 | `` d `` | Delete | View delete options for local/remote tag. |
 | `` P `` | 推送標籤 | Push the selected tag to a remote. You'll be prompted to select a remote. |
 | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
+| `` M `` | 合併到當前檢出的分支 | Merge selected branch into currently checked out branch. |
 | `` <enter> `` | 檢視提交 | |
 | `` w `` | 檢視工作目錄選項 | |
 | `` / `` | 搜尋 | |

pkg/gui/controllers/tags_controller.go

@@ -74,6 +74,13 @@ func (self *TagsController) GetKeybindings(opts types.KeybindingsOpts) []*types.
  DisplayOnScreen: true,
  OpensMenu: true,
  },
+ {
+ Key: opts.GetKey(opts.Config.Branches.MergeIntoCurrentBranch),
+ Handler: opts.Guards.OutsideFilterMode(self.withItem(self.merge)),
+ Description: self.c.Tr.Merge,
+ Tooltip: self.c.Tr.MergeBranchTooltip,
+ DisplayOnScreen: true,
+ },
  }
 
  return bindings
@@ -236,6 +243,10 @@ func (self *TagsController) create() error {
  })
 }
 
+func (self *TagsController) merge(tag *models.Tag) error {
+ return self.c.Helpers().MergeAndRebase.MergeRefIntoCheckedOutBranch(tag.RefName())
+}
+
 func (self *TagsController) context() *context.TagsContext {
  return self.c.Contexts().Tags
 }