Merge branch 'mg/meson-hook-list-buildfix'

Junio C Hamano committed 22 days ago

Merge branch 'jk/bloom-leak-fixes'

Junio C Hamano committed 22 days ago

Merge branch 'ps/history-drop'

Junio C Hamano committed 22 days ago

Merge branch 'ps/odb-drop-whence'

Junio C Hamano committed 22 days ago

Merge branch 'ps/refs-writing-subcommands'

Junio C Hamano committed 22 days ago

Merge branch 'jc/history-message-prep-fix'

Junio C Hamano committed 22 days ago

submodule--helper: avoid use of %zu for now

Junio C Hamano committed 22 days ago

t7614: avoid hiding git's exit code in a pipe

Shlok Kulshreshtha committed 22 days ago

sequencer: do not record dropped commits as rewritten

Phillip Wood committed 22 days ago

sequencer: use an enum to represent result of picking a commit

Phillip Wood committed 22 days ago

sequencer: simplify pick_one_commit()

Phillip Wood committed 22 days ago

sequencer: remove unnecessary condition in pick_one_commit()

Phillip Wood committed 22 days ago

sequencer: simplify handling of fixup with conflicts

Phillip Wood committed 22 days ago

sequencer: remove unnecessary "or" in pick_one_commit()

Phillip Wood committed 22 days ago

sequencer: never reschedule on failed commit

Phillip Wood committed 22 days ago

sequencer: be more careful with external merge

Phillip Wood committed 22 days ago

t3400: restore coverage for note copying with apply backend

Phillip Wood committed 22 days ago

diff: ignore unmerged paths outside prefix with --relative --cached

Jeff King committed 22 days ago

builtin/cat-file: filter objects via object database

Patrick Steinhardt committed 22 days ago

odb: introduce object filters to `odb_for_each_object()`

Patrick Steinhardt committed 22 days ago