Rip out merge-order and make "git log <paths>..." work again.

diff --git a/revision.h b/revision.h
index 0bed3c04ff777276f04f4f13b10764653923430f..0043c1694cbc86e78477f038ef6018e71b96983f 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -4,6 +4,7 @@
 #define SEEN           (1u<<0)
 #define UNINTERESTING   (1u<<1)
 #define TREECHANGE     (1u<<2)
+#define SHOWN          (1u<<3)
 
 struct rev_info {
        /* Starting list */
@@ -16,6 +17,7 @@ struct rev_info {
 
        /* Traversal flags */
        unsigned int    dense:1,
+                       no_merges:1,
                        remove_empty_trees:1,
                        lifo:1,
                        topo_order:1,