diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-01-14 12:32:39 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-01-14 12:32:39 -0800 |
| commit | e9f91191cc62a013a11fd6ff1a1cdaf48c5fb385 (patch) | |
| tree | bd7b6c60e15724c0d539101be61b528e33088da1 /builtin | |
| parent | 2202ab193160c5400c5025a0397e9c3e5a914946 (diff) | |
| parent | e66dc0cc4b1a625acc7200f69e0261c77fb1f0a6 (diff) | |
| download | git-e9f91191cc62a013a11fd6ff1a1cdaf48c5fb385.tar.gz git-e9f91191cc62a013a11fd6ff1a1cdaf48c5fb385.tar.xz | |
Merge branch 'km/log-usage-string-i18n'
* km/log-usage-string-i18n:
log.c: fix translation markings
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/log.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/log.c b/builtin/log.c index f2a9f0156..923ffe72c 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 }; |