Merge branch 'maint'

diff --git a/builtin/mv.c b/builtin/mv.c
index 7dd6bb491cbde95f41ba6311bbd9344a80e19b31..aec79d18386b52a943b20e6ebe0dfc9b6f074f0f 100644 (file)
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -64,7 +64,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
                OPT__VERBOSE(&verbose, N_("be verbose")),
                OPT__DRY_RUN(&show_only, N_("dry run")),
                OPT__FORCE(&force, N_("force move/rename even if target exists")),
-               OPT_BOOLEAN('k', NULL, &ignore_errors, N_("skip move/rename errors")),
+               OPT_BOOL('k', NULL, &ignore_errors, N_("skip move/rename errors")),
                OPT_END(),
        };
        const char **source, **destination, **dest_path, **submodule_gitfile;