Merge branch 'sb/gpg-plug-fd-leak'

diff --git a/revision.h b/revision.h
index 059bfff812da8033681aa11c5a9ca9085881747e..5da09ee3efa976b503cba5d13e347aad0f6c764c 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -135,6 +135,7 @@ struct rev_info {
        const char      *mime_boundary;
        const char      *patch_suffix;
        int             numbered_files;
+       int             reroll_count;
        char            *message_id;
        struct string_list *ref_message_ids;
        const char      *add_signoff;
@@ -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;