From: Phillip Wood Date: Wed, 15 Jul 2026 15:44:35 GMT Subject: Re: [PATCH v3] sequencer: honor --empty when a fixup!/squash! empties its target Message-ID: In-Reply-To: Hi Farid On 13/07/2026 17:30, Farid Zakaria wrote: > On Mon Jul 13, 2026 at 6:18 AM PDT, Phillip Wood wrote: >> On 12/07/2026 06:01, Junio C Hamano wrote: > > Thanks for cc'd. I'm not familiar with the workflow (I read the docs) > but is there an email reply when it's accepted into 'next' that I will > just look-out for ? I'm not subscribed to the mailing list in general > otherwise. There isn't a specific notification for each topic, but the status of all topics is in the regular "what's cooking in git.git" email on the list. >>> So it might make sense for you to coordinate with Phillip, and wait >>> for his topic to be merged to 'next'. After that happens, you would >>> prepare a merge commit of the other branch into f85a7e6620 (Start >>> Git 2.56 cycle, 2026-07-06) or some other stable point, and rebuild >>> this patch on top of it. That way, it will be much less likely that >>> I'd make stupid and unnecessary mismerges when attempting to >>> integrate this topic into my tree. >> >> That makes sense, assuming no-one has any more comments on >> 'pw/rebase-drop-notes-with-commit' it should in be 'next' fairly soon. >> >> Thanks >> >> Phillip > > Phillip, > > Let me know if you have any more comments. I suspect not much will > changes logic-wise once I rebase it onto 'next'. I've left some comments on the patch in a separate mail. > For clarity, is the f85a7e6620 commit the 'next' branch ? I would have > thought to just rebase ontop of 'next' and I'm a bit confused with this > commit hash. In general it is better to base patches directly on top of the topic they build on rather than on top of next. Once a topic is merged to next it should be stable, whereas the tip of next is periodically rebuilt and force-pushed. The tip of pw/rebase-drop-notes-with-commit is currently 7e70d12417d (sequencer: do not record dropped commits as rewritten, 2026-07-13) but that will change when Junio picks up v3. I find the branch tips in seen and next with git show $(git log --merges --format=%H --grep 'pw/.*drop-notes/' \ -1 origin/seen)^2 > If there is anything else I should be aware of, I would appreciate a CC > if you can remember :) Elsewhere you asked about using AI. There are some notes about that in Documentation/SubmittingPatches. TLDR it is fine so long as it does not conflict with your obligations under the Developer Certificate of Origin. Thanks Phillip