Merge branch 'maint'

diff --git a/builtin/apply.c b/builtin/apply.c
index b719f41482ee3be39d91a30f93eeabaf9d96be55..14951daedffa9e8a8a913eee5e8423220e86e291 100644 (file)
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -3872,7 +3872,7 @@ int cmd_apply(int argc, const char **argv, const char *prefix_)
                        "don't expect at least one line of context"),
                OPT_BOOLEAN(0, "reject", &apply_with_reject,
                        "leave the rejected hunks in corresponding *.rej files"),
-               OPT__VERBOSE(&apply_verbosely),
+               OPT__VERBOSE(&apply_verbosely, "be verbose"),
                OPT_BIT(0, "inaccurate-eof", &options,
                        "tolerate incorrectly detected missing new-line at the end of file",
                        INACCURATE_EOF),