Merge branch 'lt/dirwalk' into next

diff --git a/dir.h b/dir.h
index e8fc441e7fcc4d53af30881a643853a0ab96f7aa..4f65f570852f417f70f1dadc80cc51be484454f1 100644 (file)
--- a/dir.h
+++ b/dir.h
@@ -44,7 +44,5 @@ extern int excluded(struct dir_struct *, const char *);
 extern void add_excludes_from_file(struct dir_struct *, const char *fname);
 extern void add_exclude(const char *string, const char *base,
                        int baselen, struct exclude_list *which);
-extern int push_exclude_per_directory(struct dir_struct *,
-                                     const char *base, int baselen);
 
 #endif