summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJiang Xin <worldhello.net@gmail.com>2020-03-11 06:55:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-03-11 18:39:01 (GMT)
commit937d1436302582c4e769594a805978d03e89ad59 (patch)
tree55d30dd0bc1b1f6913ffe1525104a00a5bc3b02f /builtin
parent10cdb9f38adaa16aad64403bc931405564523985 (diff)
downloadgit-937d1436302582c4e769594a805978d03e89ad59.zip
git-937d1436302582c4e769594a805978d03e89ad59.tar.gz
git-937d1436302582c4e769594a805978d03e89ad59.tar.bz2
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 <worldhello.net@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/rebase.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c
index f3036f4..2bd1178 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,