Skip to content

Commit 937d143

Browse files
jiangxingitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 10cdb9f commit 937d143

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

builtin/rebase.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1551,7 +1551,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
15511551
"ignoring them"),
15521552
REBASE_PRESERVE_MERGES, PARSE_OPT_HIDDEN),
15531553
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}",
15551555
N_("how to handle commits that become empty"),
15561556
PARSE_OPT_NONEG, parse_opt_empty),
15571557
{ OPTION_CALLBACK, 'k', "keep-empty", &options, NULL,

0 commit comments

Comments
 (0)