Merge branch 'jc/diff-files-ita'
[gitweb.git] / builtin / log.c
index d65d96a7a349e3902ca080c39a3de48d9a5a55cb..dd8f3fcfc451780b244f6e6fd9e77298f484ad1a 100644 (file)
@@ -38,8 +38,8 @@ static const char *fmt_patch_subject_prefix = "PATCH";
 static const char *fmt_pretty;
 
 static const char * const builtin_log_usage[] = {
-       N_("git log [<options>] [<revision-range>] [[--] <path>...]\n")
-       N_("   or: git show [<options>] <object>..."),
+       N_("git log [<options>] [<revision range>] [[--] <path>...]"),
+       N_("git show [<options>] <object>..."),
        NULL
 };
 
@@ -705,7 +705,7 @@ static int git_format_config(const char *var, const char *value, void *cb)
                return 0;
        }
        if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff") ||
-           !strcmp(var, "color.ui")) {
+           !strcmp(var, "color.ui") || !strcmp(var, "diff.submodule")) {
                return 0;
        }
        if (!strcmp(var, "format.numbered")) {