Merge branch 'pb/error'

* pb/error:
usage: minimum type fix.
Customizable error handlers
git-merge: Don't use -p when outputting summary
git-commit: allow -e option anywhere on command line
patch-id: take "commit" prefix as well as "diff-tree" prefix

diff --git a/Makefile b/Makefile
index a5b67849b3375127cb7bfd1ec68719c747338d89..e29e3fa381dd3b36bf235d304d99f254db702492 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -582,7 +582,7 @@ git-http-push$X: revision.o http.o http-push.o $(LIB_FILE)
                $(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
 
 $(LIB_OBJS) $(BUILTIN_OBJS): $(LIB_H)
-$(patsubst git-%$X,%.o,$(PROGRAMS)): $(GITLIBS)
+$(patsubst git-%$X,%.o,$(PROGRAMS)): $(LIB_H) $(wildcard */*.h)
 $(DIFF_OBJS): diffcore.h
 
 $(LIB_FILE): $(LIB_OBJS)