Merge branch 'maint'

* maint: format-patch: generate MIME header as needed even when there is format.header
2008-03-15 00:09:20 -07:00
parent 2a2ad0c000 6bf4f1b4c9
commit 267123b429
7 changed files with 71 additions and 22 deletions
--- 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