]> git.ipfire.org Git - thirdparty/git.git/commit
pseudo-merge: implement support for selecting pseudo-merge commits
authorTaylor Blau <me@ttaylorr.com>
Thu, 23 May 2024 21:26:42 +0000 (17:26 -0400)
committerJunio C Hamano <gitster@pobox.com>
Fri, 24 May 2024 18:40:42 +0000 (11:40 -0700)
commitfaf558b23ef55b18f395d1f7a7c2714ccc1320e2
tree4b18d29919b4f980c71cd3f71a7b6efef669f8f6
parent5831f8ac41a137b93d5481cc48078cb5628538e3
pseudo-merge: implement support for selecting pseudo-merge commits

Teach the new pseudo-merge machinery how to select non-bitmapped commits
for inclusion in different pseudo-merge group(s) based on a handful of
criteria.

Note that the selected pseudo-merge commits aren't actually used or
written anywhere yet. This will be done in the following commit.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/config.txt
Documentation/config/bitmap-pseudo-merge.txt [new file with mode: 0644]
Documentation/gitpacking.txt
pack-bitmap-write.c
pack-bitmap.h
pseudo-merge.c
pseudo-merge.h