aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTaylor Blau <me@ttaylorr.com>2024-05-23 17:26:26 -0400
committerJunio C Hamano <gitster@pobox.com>2024-05-24 11:40:41 -0700
commit89f47c45df7ff65f555548718641c4610f466f08 (patch)
treedba2f842c295c81752fd92f7cca1031fb8fdbf99 /Makefile
parent4722e06edcbb57142387081684b41eda2a6cf635 (diff)
downloadgit-89f47c45df7ff65f555548718641c4610f466f08.tar.xz
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 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 1e31acc72e..6a3d164fdf 100644
--- a/Makefile
+++ b/Makefile
@@ -1119,6 +1119,7 @@ LIB_OBJS += prompt.o
LIB_OBJS += protocol.o
LIB_OBJS += protocol-caps.o
LIB_OBJS += prune-packed.o
+LIB_OBJS += pseudo-merge.o
LIB_OBJS += quote.o
LIB_OBJS += range-diff.o
LIB_OBJS += reachable.o