Merge branch 'maint-1.6.0' into maint

diff --git a/commit.h b/commit.h
index 4c05864fb426d61a652f7df12c13315665972846..3a7b06a828930ca23d0fb045feab993a1452b2d3 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -65,6 +65,8 @@ enum cmit_fmt {
 
 extern int non_ascii(int);
 struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */
+extern char *reencode_commit_message(const struct commit *commit,
+                                    const char **encoding_p);
 extern void get_commit_format(const char *arg, struct rev_info *);
 extern void format_commit_message(const struct commit *commit,
                                  const void *format, struct strbuf *sb,