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

Allow cherry-picking merge commits

Browse Source 
Now that we use git cherry-pick to implement it, there's no reason not to.
This commit is contained in:
Stefan Haller
2024-06-21 10:19:10 +02:00
parent 27825eba9e
commit 108054efc6
3 changed files with 81 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/gui/controllers/basic_commits_controller.go
View File

@ -366,10 +366,6 @@ func (self *BasicCommitsController) canCopyCommits(selectedCommits []*models.Com
if commit.Hash == "" {
return &types.DisabledReason{Text: self.c.Tr.CannotCherryPickNonCommit, ShowErrorInPanel: true}
}
if commit.IsMerge() {
return &types.DisabledReason{Text: self.c.Tr.CannotCherryPickMergeCommit, ShowErrorInPanel: true}
}
}
return nil