Merge branch 'master' into next

diff --git a/revision.h b/revision.h
index 6eaa9048a93ec152346a335de8af604aafa0faf5..872bcd81725d08d20ece460a5898e0c9ea2ca3a1 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -7,7 +7,8 @@
 #define SHOWN          (1u<<3)
 #define TMP_MARK       (1u<<4) /* for isolated cases; clean after use */
 #define BOUNDARY       (1u<<5)
-#define ADDED          (1u<<6) /* Parents already parsed and added? */
+#define BOUNDARY_SHOW  (1u<<6)
+#define ADDED          (1u<<7) /* Parents already parsed and added? */
 
 struct rev_info;
 
@@ -26,6 +27,7 @@ struct rev_info {
        /* Traversal flags */
        unsigned int    dense:1,
                        no_merges:1,
+                       no_walk:1,
                        remove_empty_trees:1,
                        lifo:1,
                        topo_order:1,
@@ -55,6 +57,7 @@ struct rev_info {
        enum cmit_fmt   commit_format;
        const char      *header_prefix;
        const char      *header;
+       const char      *use_precomputed_header;
 
        /* special limits */
        int max_count;