X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=revision.h;h=5c5510d4220679a32b2b89cc9f2867868ac392f8;hb=2f566d665ac3ef97715617aae839fa2e6f7fce93;hp=93aa012f518eb0661661f10408020e93cd8ec604;hpb=e4b5d2a83f8b90cd1e05c6a8bfd71cfc5ce5b45d;p=thirdparty%2Fgit.git

diff --git a/revision.h b/revision.h
index 93aa012f51..5c5510d422 100644
--- a/revision.h
+++ b/revision.h
@@ -193,10 +193,10 @@ struct rev_info {
 			/* Diff-merge flags */
 			explicit_diff_merges: 1,
 			merges_need_diff: 1,
+			merges_imply_patch:1,
 			separate_merges: 1,
 			combine_merges:1,
 			combined_all_paths:1,
-			combined_imply_patch:1,
 			dense_combined_merges:1,
 			first_parent_merges:1;
 
@@ -262,6 +262,7 @@ struct rev_info {
 	int min_parents;
 	int max_parents;
 	int (*include_check)(struct commit *, void *);
+	int (*include_check_obj)(struct object *obj, void *);
 	void *include_check_data;
 
 	/* diff info for patches and for paths limiting */