Merge branch 'ak/show-branch-usage-string'

diff --git a/builtin/log.c b/builtin/log.c
index f2a9f0156d8a8b15c7c879355b137b669dea8cf2..923ffe72ced41f12a2258f732be418731bc2e4a8 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -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
 };