Merge branch 'es/blame-L-twice'

diff --git a/builtin/reset.c b/builtin/reset.c
index afa6e020e83ebac739db474c278e44bc22079848..090581564b2a71d8360c1bc112ba39ceaa96825c 100644 (file)
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -258,7 +258,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
                                N_("reset HEAD, index and working tree"), MERGE),
                OPT_SET_INT(0, "keep", &reset_type,
                                N_("reset HEAD but keep local changes"), KEEP),
-               OPT_BOOLEAN('p', "patch", &patch_mode, N_("select hunks interactively")),
+               OPT_BOOL('p', "patch", &patch_mode, N_("select hunks interactively")),
                OPT_END()
        };