summaryrefslogtreecommitdiffstats
path: root/pseudo-merge.c
diff options
context:
space:
mode:
authorTaylor Blau <me@ttaylorr.com>2024-05-23 23:26:26 +0200
committerJunio C Hamano <gitster@pobox.com>2024-05-24 20:40:41 +0200
commit89f47c45df7ff65f555548718641c4610f466f08 (patch)
treedba2f842c295c81752fd92f7cca1031fb8fdbf99 /pseudo-merge.c
parentpack-bitmap: move some initialization to `bitmap_writer_init()` (diff)
downloadgit-89f47c45df7ff65f555548718641c4610f466f08.tar.xz
git-89f47c45df7ff65f555548718641c4610f466f08.zip
pseudo-merge.ch: initial commit
Add a new (empty) header file to contain the implementation for selecting, reading, and applying pseudo-merge bitmaps. For now this header and its corresponding implementation are left empty, but they will evolve over the course of subsequent commit(s). Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'pseudo-merge.c')
-rw-r--r--pseudo-merge.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/pseudo-merge.c b/pseudo-merge.c
new file mode 100644
index 0000000000..37e037ba27
--- /dev/null
+++ b/pseudo-merge.c
@@ -0,0 +1,2 @@
+#include "git-compat-util.h"
+#include "pseudo-merge.h"