Merge branch 'master' of https://github.com/vnwildman/git

diff --git a/mailmap.h b/mailmap.h
index ed7c93b05c3cc904c3052bae199346a698eec1e6..d0e65646cb57e60aa9021c0d8754c6844199acb8 100644 (file)
--- a/mailmap.h
+++ b/mailmap.h
@@ -1,6 +1,8 @@
 #ifndef MAILMAP_H
 #define MAILMAP_H
 
+struct string_list;
+
 int read_mailmap(struct string_list *map, char **repo_abbrev);
 void clear_mailmap(struct string_list *map);