Merge branch 'tg/stash-untracked-with-pathspec-fix'

diff --git a/revision.h b/revision.h
index d7a35c8c9e752cea0ea05ee7e13d696814470a83..b8c47b98e22562ef320197b4ddbc8f0c3ee40f98 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -90,7 +90,6 @@ struct rev_info {
        unsigned int    dense:1,
                        prune:1,
                        no_walk:2,
-                       show_all:1,
                        remove_empty_trees:1,
                        simplify_history:1,
                        topo_order:1,
@@ -122,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,