aboutsummaryrefslogtreecommitdiff
path: root/builtin/replace.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-02-25 15:47:35 -0800
committerJunio C Hamano <gitster@pobox.com>2022-02-25 15:47:35 -0800
commitd21d5ddfe675f9dbcdbb94ab01776115a2d1fdde (patch)
tree3b0761ff79a4e4a5c50263a8d324b6c6a9268e35 /builtin/replace.c
parenta47fcfe8712e3258d1c565cd654c9bd5312a5168 (diff)
parent9164d97a63b31614a52571d708f1ef151b97db71 (diff)
downloadgit-d21d5ddfe675f9dbcdbb94ab01776115a2d1fdde.tar.xz
Merge branch 'ja/i18n-common-messages'
Unify more messages to help l10n. * ja/i18n-common-messages: i18n: fix some misformated placeholders in command synopsis i18n: remove from i18n strings that do not hold translatable parts i18n: factorize "invalid value" messages i18n: factorize more 'incompatible options' messages
Diffstat (limited to 'builtin/replace.c')
-rw-r--r--builtin/replace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/replace.c b/builtin/replace.c
index 6ff1734d58..ac92337c0e 100644
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -22,7 +22,7 @@ static const char * const git_replace_usage[] = {
N_("git replace [-f] <object> <replacement>"),
N_("git replace [-f] --edit <object>"),
N_("git replace [-f] --graft <commit> [<parent>...]"),
- N_("git replace [-f] --convert-graft-file"),
+ "git replace [-f] --convert-graft-file",
N_("git replace -d <object>..."),
N_("git replace [--format=<format>] [-l [<pattern>]]"),
NULL