Merge branch 'tr/maint-roff-quote' into maint

diff --git a/bisect.h b/bisect.h
index 0b5d122a7b2dbe9778c35ee79d8a256980da53f6..82f8fc1910a42c5c90ad3312d9aa8f35ef2b992f 100644 (file)
--- a/bisect.h
+++ b/bisect.h
@@ -7,7 +7,9 @@ extern struct commit_list *find_bisection(struct commit_list *list,
 
 extern struct commit_list *filter_skipped(struct commit_list *list,
                                          struct commit_list **tried,
-                                         int show_all);
+                                         int show_all,
+                                         int *count,
+                                         int *skipped_first);
 
 extern void print_commit_list(struct commit_list *list,
                              const char *format_cur,
@@ -27,7 +29,7 @@ struct rev_list_info {
 
 extern int show_bisect_vars(struct rev_list_info *info, int reaches, int all);
 
-extern int bisect_next_exit(const char *prefix);
+extern int bisect_next_all(const char *prefix);
 
 extern int estimate_bisect_steps(int all);