X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=revision.h;h=4020e25c336356868057ee88e84b395f55b87b38;hb=e968751573a4ded76201a0e4414ec36649a92dda;hp=7b854866b2fe43bf01d5453d4d580ffb2179d8a5;hpb=b2934926dd7455de61577c1dfdf4c12d224e7ae0;p=git.git

diff --git a/revision.h b/revision.h
index 7b854866..4020e25c 100644
--- a/revision.h
+++ b/revision.h
@@ -7,9 +7,11 @@
 #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;
+struct log_info;
 
 typedef void (prune_fn_t)(struct rev_info *revs, struct commit *commit);
 
@@ -28,6 +30,7 @@ struct rev_info {
 			no_merges:1,
 			no_walk:1,
 			remove_empty_trees:1,
+			simplify_history:1,
 			lifo:1,
 			topo_order:1,
 			tag_objects:1,
@@ -51,11 +54,15 @@ struct rev_info {
 			always_show_header:1;
 
 	/* Format info */
-	unsigned int	abbrev_commit:1;
+	unsigned int	shown_one:1,
+			abbrev_commit:1;
 	unsigned int	abbrev;
 	enum cmit_fmt	commit_format;
-	const char	*header_prefix;
-	const char	*header;
+	struct log_info *loginfo;
+	int		nr, total;
+	const char	*mime_boundary;
+	const char	*add_signoff;
+	const char	*extra_headers;
 
 	/* special limits */
 	int max_count;