Merge branch 'eb/mail' into next

diff --git a/revision.h b/revision.h
index 62759f7bc05c0133fd900bca15f01c4d17487589..4020e25c336356868057ee88e84b395f55b87b38 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -30,6 +30,7 @@ struct rev_info {
                        no_merges:1,
                        no_walk:1,
                        remove_empty_trees:1,
+                       simplify_history:1,
                        lifo:1,
                        topo_order:1,
                        tag_objects:1,
@@ -59,6 +60,9 @@ struct rev_info {
        enum cmit_fmt   commit_format;
        struct log_info *loginfo;
        int             nr, total;
+       const char      *mime_boundary;
+       const char      *add_signoff;
+       const char      *extra_headers;
 
        /* special limits */
        int max_count;