From: Jiang Xin Date: Wed, 11 Mar 2020 06:55:27 +0000 (+0800) Subject: i18n: unmark a message in rebase.c X-Git-Tag: v2.26.0-rc2~4^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=937d1436302582c4e769594a805978d03e89ad59;p=thirdparty%2Fgit.git i18n: unmark a message in rebase.c Commit v2.25.0-4-ge98c4269c8 (rebase (interactive-backend): fix handling of commits that become empty, 2020-02-15) marked "{drop,keep,ask}" for translation, but this message should not be changed. Signed-off-by: Jiang Xin Signed-off-by: Junio C Hamano --- diff --git a/builtin/rebase.c b/builtin/rebase.c index f3036f40c6..2bd1178509 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1551,7 +1551,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) "ignoring them"), REBASE_PRESERVE_MERGES, PARSE_OPT_HIDDEN), OPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate), - OPT_CALLBACK_F(0, "empty", &options, N_("{drop,keep,ask}"), + OPT_CALLBACK_F(0, "empty", &options, "{drop,keep,ask}", N_("how to handle commits that become empty"), PARSE_OPT_NONEG, parse_opt_empty), { OPTION_CALLBACK, 'k', "keep-empty", &options, NULL,