X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=revision.h;h=31e8f615677634a92992df8404c86a8c2184ff2a;hb=6c2711e70cc070559537a44f4975add451ee53f2;hp=0bed3c04ff777276f04f4f13b10764653923430f;hpb=a4a88b2bab3b6fb0b30f63418701f42388e0fe0a;p=git.git

diff --git a/revision.h b/revision.h
index 0bed3c04f..31e8f6156 100644
--- a/revision.h
+++ b/revision.h
@@ -4,6 +4,8 @@
 #define SEEN		(1u<<0)
 #define UNINTERESTING   (1u<<1)
 #define TREECHANGE	(1u<<2)
+#define SHOWN		(1u<<3)
+#define TMP_MARK	(1u<<4) /* for isolated cases; clean after use */
 
 struct rev_info {
 	/* Starting list */
@@ -16,6 +18,7 @@ struct rev_info {
 
 	/* Traversal flags */
 	unsigned int	dense:1,
+			no_merges:1,
 			remove_empty_trees:1,
 			lifo:1,
 			topo_order:1,