git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 0/2] builtin/history: introduce "fixup" subcommand

From
Patrick Steinhardt <ps@pks.im>
Date
Apr 22, 2026, 10:28 UTC
Message-ID
<20260422-b4-pks-history-fixup-v1-0-48d4484243de@pks.im>
Hi,

this short patch series introduces a new "fixup" subcommand. This command is the first one that I felt is missing in my day to day work, as I end up doing fixup commits quite often.

The flow is rather simple: the user stages some changes, and then they execute `git history fixup <commit>` to amend those changes to the given commit. As with the other subcommands, dependent branches will then be rebased automatically.

This is the first command that may result in merge conflicts. For now we simply abort in such cases, but there are plans to introduce first-class conflicts into Git. So once we have them, we'll also be able to handle such cases more gracefully. I still think that the command is useful even without that conflict handling.

Thanks!
Patrick
---
Patrick Steinhardt (2):
      builtin/history: generalize function to commit trees
      builtin/history: introduce "fixup" subcommand
 Documentation/git-history.adoc |  52 ++++-
 builtin/history.c              | 198 ++++++++++++++--
 t/meson.build                  |   1 +
 t/t3453-history-fixup.sh       | 500 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 730 insertions(+), 21 deletions(-)

--- base-commit: 94f057755b7941b321fd11fec1b2e3ca5313a4e0 change-id: 20260422-b4-pks-history-fixup-be27e0c4a03e

Next: Patrick Steinhardt
Message 1 of 17 in “builtin/history: introduce "fixup" subcommand”
  1. 0/2 builtin/history: introduce "fixup" subcommandPatrick Steinhardt, Apr 22, 2026
  2. 1/2 builtin/history: generalize function to commit treesPatrick Steinhardt, Apr 22, 2026
  3. 2/2 builtin/history: introduce "fixup" subcommandPatrick Steinhardt, Apr 22, 2026
  4. D. Ben KnobleApr 22, 2026
  5. Patrick SteinhardtApr 23, 2026
  6. D. Ben KnobleApr 23, 2026
  7. Patrick SteinhardtApr 24, 2026
  8. D. Ben KnobleApr 24, 2026
  9. Tian YuchenApr 22, 2026
  10. Patrick SteinhardtApr 23, 2026
  11. 0/3 builtin/history: introduce "fixup" subcommandPatrick Steinhardt, Apr 27, 2026
  12. 1/3 replay: allow callers to control what happens with empty commitsPatrick Steinhardt, Apr 27, 2026
  13. Junio C HamanoMay 12, 2026
  14. 2/3 builtin/history: generalize function to commit treesPatrick Steinhardt, Apr 27, 2026
  15. 3/3 builtin/history: introduce "fixup" subcommandPatrick Steinhardt, Apr 27, 2026
  16. Junio C HamanoMay 12, 2026
  17. Patrick SteinhardtMay 12, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.