Merge branch 'mh/tempfile'

diff --git a/commit.h b/commit.h
index 4983bdd3d3e3236f3df487e8e37e85756da1e360..5d58be0017a8eb26cd3f58c1e3b0b610f684beba 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -145,7 +145,7 @@ struct pretty_print_context {
        const char *subject;
        const char *after_subject;
        int preserve_subject;
-       enum date_mode date_mode;
+       struct date_mode date_mode;
        unsigned date_mode_explicit:1;
        int need_8bit_cte;
        char *notes_message;