pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches

diff --git a/builtin-rev-list.c b/builtin-rev-list.c
index cd97ded4d249b3beb5179150a283e8be43b9ba44..c924b3a2c76c1f9a7f5531504825ed1b5456d41a 100644 (file)
--- a/builtin-rev-list.c
+++ b/builtin-rev-list.c
@@ -253,7 +253,7 @@ static void print_var_int(const char *var, int val)
        printf("%s=%d\n", var, val);
 }
 
-int show_bisect_vars(struct rev_list_info *info, int reaches, int all)
+static int show_bisect_vars(struct rev_list_info *info, int reaches, int all)
 {
        int cnt, flags = info->bisect_show_flags;
        char hex[41] = "";