Merge branch 'jc/index-update-if-able' into maint

[git.git] / builtin / merge.c

diff --git a/builtin/merge.c b/builtin/merge.c
index d534520c3e3e00f148ae3e1267130cd21bdad608..f9fb26dc3319200de96181d9e30aad75693d1704 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -194,7 +194,7 @@ static struct option builtin_merge_options[] = {
                "merge strategy to use", option_parse_strategy),
        OPT_CALLBACK('X', "strategy-option", &xopts, "option=value",
                "option for selected merge strategy", option_parse_x),
-       OPT_CALLBACK('m', "message", &merge_msg, "MESSAGE",
+       OPT_CALLBACK('m', "message", &merge_msg, "message",
                "merge commit message (for a non-fast-forward merge)",
                option_parse_message),
        OPT__VERBOSITY(&verbosity),