Merge branch 'maint'

diff --git a/log-tree.h b/log-tree.h
index 0cc9344eabdd0046edf360958376b2037ef643dc..8946ff377ca455dd1c4efaa609ce9af382005836 100644 (file)
--- a/log-tree.h
+++ b/log-tree.h
@@ -14,6 +14,8 @@ int log_tree_opt_parse(struct rev_info *, const char **, int);
 void show_log(struct rev_info *opt, const char *sep);
 void show_decorations(struct commit *commit);
 void log_write_email_headers(struct rev_info *opt, const char *name,
-                            const char **subject_p, const char **extra_headers_p);
+                            const char **subject_p,
+                            const char **extra_headers_p,
+                            int *need_8bit_cte_p);
 
 #endif