revision traversal: show full history with merge simplification

[git.git] / revision.h

diff --git a/revision.h b/revision.h
index fa68c651424e406ce84c890a655a5e292a7e5af6..dfa06b52106da5ac3dfc65676ea5dd043c95d3cf 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -12,8 +12,7 @@
 #define CHILD_SHOWN    (1u<<6)
 #define ADDED          (1u<<7) /* Parents already parsed and added? */
 #define SYMMETRIC_LEFT (1u<<8)
-#define TOPOSORT       (1u<<9) /* In the active toposort list.. */
-#define ALL_REV_FLAGS  ((1u<<10)-1)
+#define ALL_REV_FLAGS  ((1u<<9)-1)
 
 struct rev_info;
 struct log_info;
@@ -42,6 +41,7 @@ struct rev_info {
                        simplify_history:1,
                        lifo:1,
                        topo_order:1,
+                       simplify_merges:1,
                        tag_objects:1,
                        tree_objects:1,
                        blob_objects:1,