Merge branch 'jk/add-i-fixes'

[thirdparty/git.git] / revision.h

diff --git a/revision.h b/revision.h
index 889216c2d8bd0c330e05ccb439e446b5e0543542..f6bf860d19e5a2997193c25873a5ba82e030f68b 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -188,13 +188,14 @@ struct rev_info {
        unsigned int    diff:1,
                        full_diff:1,
                        show_root_diff:1,
+                       match_missing:1,
                        no_commit_id:1,
                        verbose_header:1,
-                       ignore_merges:1,
                        combine_merges:1,
                        combined_all_paths:1,
                        dense_combined_merges:1,
                        always_show_header:1;
+       int             ignore_merges:2;
 
        /* Format info */
        int             show_notes;