Merge branch 'da/downcase-u-in-usage'

diff --git a/commit.h b/commit.h
index 0adfce96e46aa9e9017d7c39eed54b01e24bc2d6..4138bb4c0850f95ba7215cb62f457cd682495968 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -86,9 +86,11 @@ struct pretty_print_context {
        enum date_mode date_mode;
        unsigned date_mode_explicit:1;
        int need_8bit_cte;
-       int show_notes;
+       char *notes_message;
        struct reflog_walk_info *reflog_info;
        const char *output_encoding;
+       struct string_list *mailmap;
+       int color;
 };
 
 struct userformat_want {
@@ -99,8 +101,7 @@ 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,
                             const char *output_encoding);
-extern char *reencode_commit_message(const struct commit *commit,
-                                    const char **encoding_p);
+extern void logmsg_free(char *msg, const struct commit *commit);
 extern void get_commit_format(const char *arg, struct rev_info *);
 extern const char *format_subject(struct strbuf *sb, const char *msg,
                                  const char *line_separator);
@@ -225,4 +226,8 @@ struct commit *get_merge_parent(const char *name);
 
 extern int parse_signed_commit(const unsigned char *sha1,
                               struct strbuf *message, struct strbuf *signature);
+extern void print_commit_list(struct commit_list *list,
+                             const char *format_cur,
+                             const char *format_last);
+
 #endif /* COMMIT_H */