mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-12 12:55:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Make WorkingTreeState a struct, and add cherry-picking and reverting states

Browse source
This commit is contained in:
Stefan Haller 2024-06-10 17:54:04 +02:00
parent 8af8f7754b
commit 542525743c
17 changed files with 176 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pkg/commands/git_commands/commit_loader.go
View file

@ -171,7 +171,7 @@ func (self *CommitLoader) MergeRebasingCommits(commits []*models.Commit) ([]*mod
}
}
if !self.getWorkingTreeState().IsRebasing() {
if !self.getWorkingTreeState().Rebasing {
// not in rebase mode so return original commits
return result, nil
}