Merge branch 'tp/send-email-from-config'

diff --git a/builtin-bisect--helper.c b/builtin-bisect--helper.c
index 8fe778766a45f8f7bfceeeef9f67a2433a892ffb..cb3e15511611240cbc3ea53a1a591fdee19ba0b9 100644 (file)
--- a/builtin-bisect--helper.c
+++ b/builtin-bisect--helper.c
@@ -4,24 +4,24 @@
 #include "bisect.h"
 
 static const char * const git_bisect_helper_usage[] = {
-       "git bisect--helper --next-vars",
+       "git bisect--helper --next-all",
        NULL
 };
 
 int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
 {
-       int next_vars = 0;
+       int next_all = 0;
        struct option options[] = {
-               OPT_BOOLEAN(0, "next-vars", &next_vars,
-                           "output next bisect step variables"),
+               OPT_BOOLEAN(0, "next-all", &next_all,
+                           "perform 'git bisect next'"),
                OPT_END()
        };
 
        argc = parse_options(argc, argv, options, git_bisect_helper_usage, 0);
 
-       if (!next_vars)
+       if (!next_all)
                usage_with_options(git_bisect_helper_usage, options);
 
-       /* next-vars */
-       return bisect_next_vars(prefix);
+       /* next-all */
+       return bisect_next_all(prefix);
 }