Merge branch 'ph/rerere-doc' into maint-1.7.8

[git.git] / mailmap.h

diff --git a/mailmap.h b/mailmap.h
index 6e48f83cedd13e24d50cddf47f037791ddc5ad4b..d5c3664322023d6552cb24006d833aa08224ff6f 100644 (file)
--- a/mailmap.h
+++ b/mailmap.h
@@ -1,7 +1,10 @@
 #ifndef MAILMAP_H
 #define MAILMAP_H
 
-int read_mailmap(struct string_list *map, const char *filename, char **repo_abbrev);
-int map_email(struct string_list *mailmap, const char *email, char *name, int maxlen);
+int read_mailmap(struct string_list *map, char **repo_abbrev);
+void clear_mailmap(struct string_list *map);
+
+int map_user(struct string_list *mailmap,
+            char *email, int maxlen_email, char *name, int maxlen_name);
 
 #endif