Support using the selected commit's message in a fixup by jesseduffield · Pull Request #5233 · jesseduffield/lazygit

jesseduffield · 2026-01-24T22:25:10Z

PR Description

I had a spare couple hours so figured I'd whip up a PR for a feature I've wanted for a while.

I've optimised for muscle memory backwards compatibility here:

Outside interactive rebase: press 'f' then instead of a confirmation panel, a menu appears where you can choose to keep the selected commit's message
Inside interactive rebase: press 'f' then press 'c' to see the menu for keeping the message, where if you press 'c' again it will retain the current message. so 'fcc' is the chord to press.

We're also now showing the -C flag (which is what enables the behaviour) against the todo.

I've picked the 'c' keybinding because 'C' was taken and it corresponds to the flag. Previously that showed a warning about a change in keybinding for cherry picking but it's been ages since we've made that change so I'm happy to retire it.

Please check if the PR fulfills these requirements

Cheatsheets are up-to-date (run go generate ./...)
Code has been formatted (see here)
Tests have been added/updated (see here for the integration test guide)
Text is internationalised (see here)
If a new UserConfig entry was added, make sure it can be hot-reloaded (see here)
Docs have been updated if necessary
You've read through your own file changes for silly mistakes etc

codacy-production · 2026-01-24T22:37:35Z

Coverage summary from Codacy

See diff coverage on Codacy

Coverage variation	Diff coverage
Report missing for `39cd474`¹	✅ 96.41%

Coverage variation details

	Coverable lines	Covered lines	Coverage
Common ancestor commit (`39cd474`)	Report Missing	Report Missing	Report Missing
Head commit (`f317a97`)	59607	51936	87.13%

Coverage variation is the difference between the coverage for the head and common ancestor commits of the pull request branch: <coverage of head commit> - <coverage of common ancestor commit>

Diff coverage details

	Coverable lines	Covered lines	Diff coverage
Pull request (#5233)	167	161	96.41%

Diff coverage is the percentage of lines that are covered by tests out of the coverable lines that the pull request added or modified: <covered lines added or modified>/<coverable lines added or modified> * 100%

See your quality gate settings Change summary preferences

Codacy didn't receive coverage data for the commit, or there was an error processing the received data. Check your integration for errors and validate that your coverage setup is correct. ↩

stefanhaller

This is similar to #4526 in many ways, except for the addition of the extra c command, which is a great idea.

My main problem with #4526 was that I found the new fixup menu (outside of rebase) more confusing than the old confirmation, so it slowed me down even though the muscle memory interaction stayed the same; that's probably better in your version because the top menu entry simply says "Fixup", which I like. I'll use this in production for a while and see how it feels.

I didn't look at the code very much yet, just a little bit of early feedback about the texts.

It's been ages since we changed the key, users should hopefully be used to it by now, and we want to reuse the key for something else later in the branch. Co-authored-by: Stefan Haller <stefan@haller-berlin.de>

Co-authored-by: Stefan Haller <stefan@haller-berlin.de>

Not used yet, we pass an empty string everywhere, to match the previous behavior. Just extracting this into a separate commit to make the next one smaller. Co-authored-by: Stefan Haller <stefan@haller-berlin.de>

stefanhaller

This is very nice; I used it for a while now, and have no issues with the workflow. I even used the feature of using the upper commit's message once, so that's a welcome improvement.

I took the liberty to break up the large commit into a few smaller ones, I find this much easier to review.

stefanhaller · 2026-01-28T09:25:43Z

+			Lines(
+				Contains("--- Pending rebase todos ---"),
+				Contains("pick").Contains("Third Commit"),
+				Contains("fixup").Contains("Second Commit").IsSelected(),


I usually prefer matching larger parts of a line instead of multiple Contains, mainly because it's more robust (you'd need a DoesNotContain("-C") in your version), but also because I find it easier to read.

Fixed in 897e01b.

I've optimised for muscle memory backwards compatibility here: - Outside interactive rebase: press 'f' then instead of a confirmation panel, a menu appears where you can choose to keep the selected commit's message - Inside interactive rebase: press 'f' then press 'c' to see the menu for keeping the message, where if you press 'c' again it will retain the current message. so 'fcc' is the chord to press. We're also now showing the -C flag (which is what enables the behaviour) against the todo. I've picked the 'c' keybinding because 'C' was taken and it corresponds to the flag. Previously that showed a warning about a change in keybinding for cherry picking but it's been ages since we've made that change so I'm happy to retire it.

This MR contains the following updates: | Package | Update | Change | |---|---|---| | [jesseduffield/lazygit](https://github.com/jesseduffield/lazygit) | minor | `v0.58.1` → `v0.59.0` | MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot). **Proposed changes to behavior should be submitted there as MRs.** --- ### Release Notes <details> <summary>jesseduffield/lazygit (jesseduffield/lazygit)</summary> ### [`v0.59.0`](https://github.com/jesseduffield/lazygit/releases/tag/v0.59.0) [Compare Source](jesseduffield/lazygit@v0.58.1...v0.59.0)  #### What's Changed ##### Enhancements 🔥 - Have "Find base commit for fixup" ignore fixup commits for the found base commit by [@stefanhaller](https://github.com/stefanhaller) in [#5210](jesseduffield/lazygit#5210) - Exclude commit trailers from line wrapping by [@stefanhaller](https://github.com/stefanhaller) in [#5230](jesseduffield/lazygit#5230) - Limit popup panel widths to a maximum width by [@stefanhaller](https://github.com/stefanhaller) in [#5231](jesseduffield/lazygit#5231) - Support using the selected commit's message in a fixup by [@jesseduffield](https://github.com/jesseduffield) in [#5233](jesseduffield/lazygit#5233) - Fix gitignore path collisions by [@DawidPietrykowski](https://github.com/DawidPietrykowski) in [#5245](jesseduffield/lazygit#5245) ##### Fixes 🔧 - Don't log the "git rev-list" call when marking bisect commits by [@stefanhaller](https://github.com/stefanhaller) in [#5236](jesseduffield/lazygit#5236) - Fix opening a menu when a previous menu was scrolled down by [@stefanhaller](https://github.com/stefanhaller) in [#5238](jesseduffield/lazygit#5238) - When moving commits up/down and the selection leaves the view, scroll to make it visible again by [@stefanhaller](https://github.com/stefanhaller) in [#5247](jesseduffield/lazygit#5247) - Fix rendering of CRLF sequence ('\r\n') by [@stefanhaller](https://github.com/stefanhaller) in [#5237](jesseduffield/lazygit#5237) - Fix rendering of the Reflog panel when using up/down to scroll it by [@stefanhaller](https://github.com/stefanhaller) in [#5248](jesseduffield/lazygit#5248) - Add Nushell support for nvim-remote preset by [@baiyeidk](https://github.com/baiyeidk) in [#5250](jesseduffield/lazygit#5250) ##### Maintenance ⚙️ - Update devcontainer `VARIANT` to `1-trixie` by [@mricherzhagen](https://github.com/mricherzhagen) in [#5204](jesseduffield/lazygit#5204) - chore: Update outdated GitHub Actions versions by [@pgoslatara](https://github.com/pgoslatara) in [#5220](jesseduffield/lazygit#5220) - Disable the automatic, scheduled release by [@stefanhaller](https://github.com/stefanhaller) in [#5272](jesseduffield/lazygit#5272) - Auto-update cheatsheets after updating translation by [@stefanhaller](https://github.com/stefanhaller) in [#5275](jesseduffield/lazygit#5275) ##### Docs 📖 - Update README to add GitArbor TUI as an alternative by [@cadamsdev](https://github.com/cadamsdev) in [#5257](jesseduffield/lazygit#5257) - Update docs and schema for release by [@stefanhaller](https://github.com/stefanhaller) in [#5276](jesseduffield/lazygit#5276) ##### I18n 🌎 - Update translations from Crowdin by [@stefanhaller](https://github.com/stefanhaller) in [#5274](jesseduffield/lazygit#5274) #### New Contributors - [@pgoslatara](https://github.com/pgoslatara) made their first contribution in [#5220](jesseduffield/lazygit#5220) - [@cadamsdev](https://github.com/cadamsdev) made their first contribution in [#5257](jesseduffield/lazygit#5257) - [@baiyeidk](https://github.com/baiyeidk) made their first contribution in [#5250](jesseduffield/lazygit#5250) **Full Changelog**: <jesseduffield/lazygit@v0.58.1...v0.59.0> </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).

jesseduffield added the enhancement New feature or request label Jan 24, 2026

jesseduffield force-pushed the fixup-up branch from b6121f7 to 15e0386 Compare January 24, 2026 22:34

jesseduffield requested a review from stefanhaller January 24, 2026 22:43

stefanhaller reviewed Jan 25, 2026

View reviewed changes

Comment thread docs/Config.md Outdated

Comment thread pkg/i18n/english.go Outdated

jesseduffield force-pushed the fixup-up branch from 7ae2965 to dad04be Compare January 26, 2026 06:46

jesseduffield requested a review from stefanhaller January 26, 2026 06:47

jesseduffield and others added 4 commits January 28, 2026 10:15

Remove the "old cherry-pick key" warning

3bf833a

It's been ages since we changed the key, users should hopefully be used to it by now, and we want to reuse the key for something else later in the branch. Co-authored-by: Stefan Haller <stefan@haller-berlin.de>

Add ActionFlag field to Commit

de98258

Co-authored-by: Stefan Haller <stefan@haller-berlin.de>

Show -C for fixup todos in rebase if present

99e26be

Co-authored-by: Stefan Haller <stefan@haller-berlin.de>

Pass todo flag to EditRebaseTodo

6f6545e

Not used yet, we pass an empty string everywhere, to match the previous behavior. Just extracting this into a separate commit to make the next one smaller. Co-authored-by: Stefan Haller <stefan@haller-berlin.de>

stefanhaller force-pushed the fixup-up branch from dad04be to 897e01b Compare January 28, 2026 09:16

stefanhaller approved these changes Jan 28, 2026

View reviewed changes

stefanhaller force-pushed the fixup-up branch from 897e01b to f317a97 Compare January 28, 2026 09:29

stefanhaller enabled auto-merge January 28, 2026 09:29

stefanhaller mentioned this pull request Jan 28, 2026

Support fixup with keeping the message of the selected commit #4526

Closed

stefanhaller merged commit ce202a5 into master Jan 28, 2026
13 checks passed

stefanhaller deleted the fixup-up branch January 28, 2026 09:31

BrewTestBot mentioned this pull request Feb 7, 2026

lazygit 0.59.0 Homebrew/homebrew-core#266309

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Support using the selected commit's message in a fixup#5233

Support using the selected commit's message in a fixup#5233
stefanhaller merged 5 commits into
masterfrom
fixup-up

jesseduffield commented Jan 24, 2026 •

edited

Loading

Uh oh!

codacy-production Bot commented Jan 24, 2026 •

edited

Loading

Uh oh!

stefanhaller left a comment

Uh oh!

Uh oh!

Uh oh!

stefanhaller left a comment

Uh oh!

stefanhaller Jan 28, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

jesseduffield commented Jan 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

PR Description

Please check if the PR fulfills these requirements

Uh oh!

codacy-production Bot commented Jan 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Coverage summary from Codacy

See diff coverage on Codacy

See your quality gate settings Change summary preferences

Footnotes

Uh oh!

stefanhaller left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

stefanhaller left a comment

Choose a reason for hiding this comment

Uh oh!

stefanhaller Jan 28, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

jesseduffield commented Jan 24, 2026 •

edited

Loading

codacy-production Bot commented Jan 24, 2026 •

edited

Loading