mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-05-11 12:25:47 +02:00
Add new commit status StatusCherryPickingOrReverting
This is needed because we want to show different section headers for rebase todos and cherry-pick/revert todos.
This commit is contained in:
parent
e90a3dc666
commit
98c19feccf
3 changed files with 3 additions and 2 deletions
|
@ -496,7 +496,7 @@ func (self *CommitLoader) getSequencerCommits() []*models.Commit {
|
|||
commits = utils.Prepend(commits, &models.Commit{
|
||||
Hash: t.Commit,
|
||||
Name: t.Msg,
|
||||
Status: models.StatusRebasing,
|
||||
Status: models.StatusCherryPickingOrReverting,
|
||||
Action: t.Command,
|
||||
})
|
||||
}
|
||||
|
|
|
@ -18,6 +18,7 @@ const (
|
|||
StatusPushed
|
||||
StatusMerged
|
||||
StatusRebasing
|
||||
StatusCherryPickingOrReverting
|
||||
StatusConflicted
|
||||
StatusReflog
|
||||
)
|
||||
|
|
|
@ -505,7 +505,7 @@ func getHashColor(
|
|||
hashColor = style.FgYellow
|
||||
case models.StatusMerged:
|
||||
hashColor = style.FgGreen
|
||||
case models.StatusRebasing, models.StatusConflicted:
|
||||
case models.StatusRebasing, models.StatusCherryPickingOrReverting, models.StatusConflicted:
|
||||
hashColor = style.FgBlue
|
||||
case models.StatusReflog:
|
||||
hashColor = style.FgBlue
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue