Merge branch 'aw/rebase-i-stop-on-failure-to-amend'

diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index 5b226399e1c30b23a7b5d226a3f45efe9dbedf45..8d325a5179f68d2810b5b2082fe66dc6d00da455 100644 (file)
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c
@@ -4,16 +4,19 @@
 #include "bisect.h"
 
 static const char * const git_bisect_helper_usage[] = {
-       "git bisect--helper --next-all",
+       "git bisect--helper --next-all [--no-checkout]",
        NULL
 };
 
 int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
 {
        int next_all = 0;
+       int no_checkout = 0;
        struct option options[] = {
                OPT_BOOLEAN(0, "next-all", &next_all,
                            "perform 'git bisect next'"),
+               OPT_BOOLEAN(0, "no-checkout", &no_checkout,
+                           "update BISECT_HEAD instead of checking out the current commit"),
                OPT_END()
        };
 
@@ -24,5 +27,5 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
                usage_with_options(git_bisect_helper_usage, options);
 
        /* next-all */
-       return bisect_next_all(prefix);
+       return bisect_next_all(prefix, no_checkout);
 }