Merge branch 'nd/git-dir-pointing-at-gitfile'

diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index e3884e3bb61c7dfb0cd97ddba7bd0558b44c6b8f..3324229025300f7d7de600753c03af3ac22e2152 100644 (file)
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c
@@ -13,10 +13,10 @@ 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,
-                           N_("perform 'git bisect next'")),
-               OPT_BOOLEAN(0, "no-checkout", &no_checkout,
-                           N_("update BISECT_HEAD instead of checking out the current commit")),
+               OPT_BOOL(0, "next-all", &next_all,
+                        N_("perform 'git bisect next'")),
+               OPT_BOOL(0, "no-checkout", &no_checkout,
+                        N_("update BISECT_HEAD instead of checking out the current commit")),
                OPT_END()
        };