diff options
| author | Taylor Blau <me@ttaylorr.com> | 2024-04-29 16:43:11 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-04-30 13:00:25 -0700 |
| commit | 48b75c4c918034eb9a41b3486302873865928e23 (patch) | |
| tree | f756f856910bc28ea816d05ee8c14939c2c596b5 | |
| parent | bde4efc36a6e7463bbe378a9f0600206cb63bb65 (diff) | |
| download | git-48b75c4c918034eb9a41b3486302873865928e23.tar.gz | |
pseudo-merge.ch: initial commit
Notice: this object is not reachable from any branch.
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>
Notice: this object is not reachable from any branch.
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | pseudo-merge.c | 2 | ||||
| -rw-r--r-- | pseudo-merge.h | 6 |
3 files changed, 9 insertions, 0 deletions
@@ -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 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" diff --git a/pseudo-merge.h b/pseudo-merge.h new file mode 100644 index 0000000000..cab8ff6960 --- /dev/null +++ b/pseudo-merge.h @@ -0,0 +1,6 @@ +#ifndef PSEUDO_MERGE_H +#define PSEUDO_MERGE_H + +#include "git-compat-util.h" + +#endif |