From 99e26be3d9753dc28dbfb537a2c0b3f710b51f59 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Wed, 28 Jan 2026 09:31:34 +0100 Subject: [PATCH] Show -C for fixup todos in rebase if present Co-authored-by: Stefan Haller --- pkg/gui/presentation/commits.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkg/gui/presentation/commits.go b/pkg/gui/presentation/commits.go index a5799bcb3..67fa62ac8 100644 --- a/pkg/gui/presentation/commits.go +++ b/pkg/gui/presentation/commits.go @@ -385,7 +385,12 @@ func displayCommit( actionString := "" if commit.Action != models.ActionNone { - actionString = actionColorMap(commit.Action, commit.Status).Sprint(commit.Action.String()) + actionStr := commit.Action.String() + // Only show the flag for fixup commands (where -C changes the meaning) + if commit.ActionFlag != "" && commit.Action == todo.Fixup { + actionStr += " " + commit.ActionFlag + } + actionString = actionColorMap(commit.Action, commit.Status).Sprint(actionStr) } tagString := ""