@matheusbsbs / matheus-bagliano / commits / 937d143630
Fork 0

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>

Jiang Xin committed Mar 11, 2020 at 14:55 UTC 937d1436302582c4e769594a805978d03e89ad59
1 file changed +1 -1
builtin/rebase.c
+1 -1
@@ -1551,7 +1551,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
1551 "ignoring them"),
1552 REBASE_PRESERVE_MERGES, PARSE_OPT_HIDDEN),
1553 OPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate),
1554 - OPT_CALLBACK_F(0, "empty", &options, N_("{drop,keep,ask}"),
1554 + OPT_CALLBACK_F(0, "empty", &options, "{drop,keep,ask}",
1555 N_("how to handle commits that become empty"),
1556 PARSE_OPT_NONEG, parse_opt_empty),
1557 { OPTION_CALLBACK, 'k', "keep-empty", &options, NULL,