Merge branch 'maint'

diff --git a/revision.h b/revision.h
index e4a912ae6b55326ab4a75534690b4fa592229318..5da09ee3efa976b503cba5d13e347aad0f6c764c 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -111,6 +111,7 @@ struct rev_info {
 
        /* Format info */
        unsigned int    shown_one:1,
+                       shown_dashes:1,
                        show_merge:1,
                        show_notes:1,
                        show_notes_given:1,
@@ -143,6 +144,7 @@ struct rev_info {
        const char      *subject_prefix;
        int             no_inline;
        int             show_log_size;
+       struct string_list *mailmap;
 
        /* Filter by commit log message */
        struct grep_opt grep_filter;