diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-02-25 23:47:35 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-02-25 23:47:35 (GMT) |
| commit | d21d5ddfe675f9dbcdbb94ab01776115a2d1fdde (patch) | |
| tree | 3b0761ff79a4e4a5c50263a8d324b6c6a9268e35 /builtin/rebase.c | |
| parent | a47fcfe8712e3258d1c565cd654c9bd5312a5168 (diff) | |
| parent | 9164d97a63b31614a52571d708f1ef151b97db71 (diff) | |
| download | git-d21d5ddfe675f9dbcdbb94ab01776115a2d1fdde.zip git-d21d5ddfe675f9dbcdbb94ab01776115a2d1fdde.tar.gz git-d21d5ddfe675f9dbcdbb94ab01776115a2d1fdde.tar.bz2 | |
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/rebase.c')
| -rw-r--r-- | builtin/rebase.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index d858add..b29ad2b 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -37,7 +37,7 @@ static char const * const builtin_rebase_usage[] = { "[--onto <newbase> | --keep-base] [<upstream> [<branch>]]"), N_("git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] " "--root [<branch>]"), - N_("git rebase --continue | --abort | --skip | --edit-todo"), + "git rebase --continue | --abort | --skip | --edit-todo", NULL }; |