X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=revision.h;h=9fd8f3016fe8f935f176f57c615f72df8ba8d157;hb=f143d9c695cd4c3e86069c536fa0dff04fc93e93;hp=ae948601f94c726c3677f23517dba5c046431904;hpb=a080fdd1b15612f71e5cc660c108f7d6c03804dd;p=git.git

diff --git a/revision.h b/revision.h
index ae948601f..9fd8f3016 100644
--- a/revision.h
+++ b/revision.h
@@ -41,8 +41,6 @@ struct rev_info {
 	/* Traversal flags */
 	unsigned int	dense:1,
 			prune:1,
-			no_merges:1,
-			merges_only:1,
 			no_walk:1,
 			show_all:1,
 			remove_empty_trees:1,
@@ -126,6 +124,8 @@ struct rev_info {
 	int max_count;
 	unsigned long max_age;
 	unsigned long min_age;
+	int min_parents;
+	int max_parents;
 
 	/* diff info for patches and for paths limiting */
 	struct diff_options diffopt;