From: Junio C Hamano Date: Tue, 12 May 2026 05:47:41 GMT Subject: Re: [PATCH v3 0/3] builtin/history: introduce "fixup" subcommand Message-ID: In-Reply-To: <20260427-b4-pks-history-fixup-v3-0-cb908f06264b@pks.im> Patrick Steinhardt writes: > 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 ` 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. > > Changes in v3: > - Some more polishing of the command's description. > - Link to v2: https://patch.msgid.link/20260423-b4-pks-history-fixup-v2-0-d7571c6d36eb@pks.im > > Changes in v2: > - Introduce "--empty=(keep|drop|abort)" to specify what happens with > empty commits. > - Adapt documentation a bit to hopefully clarify how changes are > backported. > - Link to v1: https://patch.msgid.link/20260422-b4-pks-history-fixup-v1-0-48d4484243de@pks.im The iterations v2 and v3 saw no comments, unfortunately. I just gave three patches in v3 a cursory look and nothing stood out as curious or fishy. Shall we mark the topic for 'next' now?