Merge branch 'jc/color' into next

diff --git a/Makefile b/Makefile
index ab021eddbd3f3f827fe373806a9001e07130a9c9..25b99e62d1c891fe9d1185eb3cc7648fe811835a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -470,6 +470,8 @@ git$X: git.c common-cmds.h $(BUILTIN_OBJS) $(GITLIBS)
                $(ALL_CFLAGS) -o $@ $(filter %.c,$^) \
                $(BUILTIN_OBJS) $(ALL_LDFLAGS) $(LIBS)
 
+builtin-help.o: common-cmds.h
+
 $(BUILT_INS): git$X
        rm -f $@ && ln git$X $@