summaryrefslogtreecommitdiff
path: root/builtin/log.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-01-14 20:32:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-01-14 20:32:39 (GMT)
commite9f91191cc62a013a11fd6ff1a1cdaf48c5fb385 (patch)
treebd7b6c60e15724c0d539101be61b528e33088da1 /builtin/log.c
parent2202ab193160c5400c5025a0397e9c3e5a914946 (diff)
parente66dc0cc4b1a625acc7200f69e0261c77fb1f0a6 (diff)
downloadgit-e9f91191cc62a013a11fd6ff1a1cdaf48c5fb385.zip
git-e9f91191cc62a013a11fd6ff1a1cdaf48c5fb385.tar.gz
git-e9f91191cc62a013a11fd6ff1a1cdaf48c5fb385.tar.bz2
Merge branch 'km/log-usage-string-i18n'
* km/log-usage-string-i18n: log.c: fix translation markings
Diffstat (limited to 'builtin/log.c')
-rw-r--r--builtin/log.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/log.c b/builtin/log.c
index f2a9f01..923ffe7 100644
--- 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
};