Handle core.symlinks=false case in merge-recursive.

[git.git] / revision.h

diff --git a/revision.h b/revision.h
index 8f7907d7abdb764317612d868f58ab88f7175b59..5fec1846f366f1aadabc6f57edcfd17828afa8ee 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -42,7 +42,8 @@ struct rev_info {
                        unpacked:1, /* see also ignore_packed below */
                        boundary:1,
                        left_right:1,
-                       parents:1;
+                       parents:1,
+                       reverse:2;
 
        /* Diff flags */
        unsigned int    diff:1,
@@ -89,6 +90,8 @@ struct rev_info {
 
        topo_sort_set_fn_t topo_setter;
        topo_sort_get_fn_t topo_getter;
+
+       struct reflog_walk_info *reflog_info;
 };
 
 #define REV_TREE_SAME          0