Merge with master.

This merges commit
3c4e8a636f4de3668b24d0020df731cdc78ae6e9
from master into our head commit
80f45687f44b6258b0eacae6b1ae15e3ad4a6552

Sincerely,
jit-merge command.

diff --git a/Makefile b/Makefile
index c01327c1c623950f8b9f83d913ef6d7aa136ced0..e574f44faf4003664596fbef2ff7859b5e10865b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -174,6 +174,7 @@ init-db.o: init-db.c
        $(CC) -c $(CFLAGS) -DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir)"' $*.c
 
 $(LIB_OBJS): $(LIB_H)
+$(patsubst git-%,%.o,$(PROG)): $(LIB_H)
 $(DIFF_OBJS): diffcore.h
 
 $(LIB_FILE): $(LIB_OBJS)