Merge branch 'ab/mailmap'

[thirdparty/git.git] / builtin / log.c

diff --git a/builtin/log.c b/builtin/log.c
index 4ee81bc976d3483141b523d43623c8c4132fdddc..fd282def43f3a7b65e1596fc84978cec8473ff38 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -177,7 +177,7 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
        const struct option builtin_log_options[] = {
                OPT__QUIET(&quiet, N_("suppress diff output")),
                OPT_BOOL(0, "source", &source, N_("show source")),
-               OPT_BOOL(0, "use-mailmap", &mailmap, N_("Use mail map file")),
+               OPT_BOOL(0, "use-mailmap", &mailmap, N_("use mail map file")),
                OPT_ALIAS(0, "mailmap", "use-mailmap"),
                OPT_STRING_LIST(0, "decorate-refs", &decorate_refs_include,
                                N_("pattern"), N_("only decorate refs that match <pattern>")),
@@ -186,7 +186,7 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
                OPT_CALLBACK_F(0, "decorate", NULL, NULL, N_("decorate options"),
                               PARSE_OPT_OPTARG, decorate_callback),
                OPT_CALLBACK('L', NULL, &line_cb, "range:file",
-                            N_("Trace the evolution of line range <start>,<end> or function :<funcname> in <file>"),
+                            N_("trace the evolution of line range <start>,<end> or function :<funcname> in <file>"),
                             log_line_range_callback),
                OPT_END()
        };
@@ -1757,13 +1757,13 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
                OPT_INTEGER(0, "filename-max-length", &fmt_patch_name_max,
                            N_("max length of output filename")),
                OPT_CALLBACK_F(0, "rfc", &rev, NULL,
-                           N_("Use [RFC PATCH] instead of [PATCH]"),
+                           N_("use [RFC PATCH] instead of [PATCH]"),
                            PARSE_OPT_NOARG | PARSE_OPT_NONEG, rfc_callback),
                OPT_STRING(0, "cover-from-description", &cover_from_description_arg,
                            N_("cover-from-description-mode"),
                            N_("generate parts of a cover letter based on a branch's description")),
                OPT_CALLBACK_F(0, "subject-prefix", &rev, N_("prefix"),
-                           N_("Use [<prefix>] instead of [PATCH]"),
+                           N_("use [<prefix>] instead of [PATCH]"),
                            PARSE_OPT_NONEG, subject_prefix_callback),
                OPT_CALLBACK_F('o', "output-directory", &output_directory,
                            N_("dir"), N_("store resulting files in <dir>"),