Merge branch 'lt/config' into next

diff --git a/builtin-diff.c b/builtin-diff.c
index d3ac581f291dae630478248133344e2dd6a80b06..71742aa10b3b8e2621eecd4be929946b0a308deb 100644 (file)
--- a/builtin-diff.c
+++ b/builtin-diff.c
@@ -231,7 +231,7 @@ static int builtin_diff_combined(struct rev_info *revs,
        return 0;
 }
 
-static void add_head(struct rev_info *revs)
+void add_head(struct rev_info *revs)
 {
        unsigned char sha1[20];
        struct object *obj;