Merge branch 'nd/pretty-formats'

diff --git a/commit.h b/commit.h
index 057ff8045efb2cc80f747ee15b2a308a6dead5e5..67bd5091be0b34bfea075cd60281d22cf5b34768 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -101,6 +101,7 @@ struct userformat_want {
 extern int has_non_ascii(const char *text);
 struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */
 extern char *logmsg_reencode(const struct commit *commit,
+                            char **commit_encoding,
                             const char *output_encoding);
 extern void logmsg_free(char *msg, const struct commit *commit);
 extern void get_commit_format(const char *arg, struct rev_info *);