Skip to content

Commit 89f47c4

Browse files
ttaylorrgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 4722e06 commit 89f47c4

File tree

3 files changed

+9
-0
lines changed

3 files changed

+9
-0
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1119,6 +1119,7 @@ LIB_OBJS += prompt.o
11191119
LIB_OBJS += protocol.o
11201120
LIB_OBJS += protocol-caps.o
11211121
LIB_OBJS += prune-packed.o
1122+
LIB_OBJS += pseudo-merge.o
11221123
LIB_OBJS += quote.o
11231124
LIB_OBJS += range-diff.o
11241125
LIB_OBJS += reachable.o

pseudo-merge.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#include "git-compat-util.h"
2+
#include "pseudo-merge.h"

pseudo-merge.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#ifndef PSEUDO_MERGE_H
2+
#define PSEUDO_MERGE_H
3+
4+
#include "git-compat-util.h"
5+
6+
#endif

0 commit comments

Comments
 (0)