diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-07-27 09:09:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-07-27 09:09:01 -0700 |
| commit | f364885cb3d7ebb324d445fc9523156db278755f (patch) | |
| tree | 5b58fe19cf5b100bb0ac0cdb9e1743ace01a1801 /t/t4013/diff.diff_initial..side | |
| parent | bb8bc6995e589018f60bbdbf16001e16d7e20d25 (diff) | |
| parent | 42554b78fd2c3ce252647c9c5afbf04d2f2885f5 (diff) | |
Merge branch 'pw/rebase-drop-notes-with-commit'
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
Diffstat (limited to 't/t4013/diff.diff_initial..side')
0 files changed, 0 insertions, 0 deletions