Merge branch 'jc/maint-diff-quiet'

[git.git] / revision.h

diff --git a/revision.h b/revision.h
index 91f194478bb91d381ab2b2440215144d8bb8d18d..fc23522b3850edb3752181596fd83da8599e3d27 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -42,6 +42,7 @@ struct rev_info {
                        simplify_history:1,
                        lifo:1,
                        topo_order:1,
+                       simplify_merges:1,
                        tag_objects:1,
                        tree_objects:1,
                        blob_objects:1,
@@ -110,6 +111,7 @@ struct rev_info {
 
        struct reflog_walk_info *reflog_info;
        struct decoration children;
+       struct decoration merge_simplification;
 };
 
 #define REV_TREE_SAME          0