git-rebase: error out when incompatible options passed

diff --git a/revision.h b/revision.h
index 187406b6ebfde26e11681cd4884b118ed10cd84a..b8c47b98e22562ef320197b4ddbc8f0c3ee40f98 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -121,7 +121,10 @@ struct rev_info {
                        ancestry_path:1,
                        first_parent_only:1,
                        line_level_traverse:1,
-                       tree_blobs_in_commit_order:1;
+                       tree_blobs_in_commit_order:1,
+
+                       /* for internal use only */
+                       exclude_promisor_objects:1;
 
        /* Diff flags */
        unsigned int    diff:1,