From: Junio C Hamano Date: Mon, 20 Jul 2026 18:16:43 +0000 (-0700) Subject: Merge branch 'pw/rebase-drop-notes-with-commit' into next X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5475c9f935080e24d3ddd42c1c5f14bda3309bc5;p=thirdparty%2Fgit.git Merge branch 'pw/rebase-drop-notes-with-commit' into next The rebase post-rewrite notes-copying logic has been corrected. When a commit is dropped during rebase (e.g., because its changes are already upstream), it is no longer recorded as rewritten, preventing its notes from being copied to an unrelated commit. * pw/rebase-drop-notes-with-commit: sequencer: do not record dropped commits as rewritten sequencer: use an enum to represent result of picking a commit sequencer: simplify pick_one_commit() sequencer: remove unnecessary condition in pick_one_commit() sequencer: simplify handling of fixup with conflicts sequencer: remove unnecessary "or" in pick_one_commit() sequencer: never reschedule on failed commit sequencer: be more careful with external merge t3400: restore coverage for note copying with apply backend --- 5475c9f935080e24d3ddd42c1c5f14bda3309bc5