color merged and unmerged commits differently

1 files changed, 5 insertions, 2 deletions

diff --git a/pkg/gui/commits_panel.go b/pkg/gui/commits_panel.go
index 1c1662475..3d9b10058 100644
--- a/pkg/gui/commits_panel.go
+++ b/pkg/gui/commits_panel.go
@@ -17,12 +17,15 @@ func (gui *Gui) refreshCommits(g *gocui.Gui) error {
 		}
 		v.Clear()
 		red := color.New(color.FgRed)
-		yellow := color.New(color.FgYellow)
+		yellow := color.New(color.FgGreen)
+		green := color.New(color.FgYellow)
 		white := color.New(color.FgWhite)
 		shaColor := white
 		for _, commit := range gui.State.Commits {
-			if commit.Pushed {
+			if !commit.Pushed {
 				shaColor = red
+			} else if !commit.Merged {
+				shaColor = green
 			} else {
 				shaColor = yellow
 			}