Merge branch 'jk/rebase-i-submodule-conflict-only'

diff --git a/bisect.h b/bisect.h
index 22f2e4db2d1d05184dc2eeec2ff87021a67e01f2..ec3c3ff007a53105089b9699d5917bccc28c7cfe 100644 (file)
--- a/bisect.h
+++ b/bisect.h
@@ -15,13 +15,12 @@ extern void print_commit_list(struct commit_list *list,
                              const char *format_cur,
                              const char *format_last);
 
-/* bisect_show_flags flags in struct rev_list_info */
 #define BISECT_SHOW_ALL                (1<<0)
-#define BISECT_SHOW_TRIED      (1<<1)
+#define REV_LIST_QUIET         (1<<1)
 
 struct rev_list_info {
        struct rev_info *revs;
-       int bisect_show_flags;
+       int flags;
        int show_timestamp;
        int hdr_termination;
        const char *header_prefix;