Skip to content

Commit 7306b39

Browse files
ralfthgitster
authored andcommitted
pull: don't mark values for option "rebase" for translation
"false|true|preserve" are actual values for option "rebase" of the "git-pull" command and should therefore not be marked for translation. Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 689efb7 commit 7306b39

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

builtin/pull.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ static struct option pull_options[] = {
112112
/* Options passed to git-merge or git-rebase */
113113
OPT_GROUP(N_("Options related to merging")),
114114
{ OPTION_CALLBACK, 'r', "rebase", &opt_rebase,
115-
N_("false|true|preserve"),
115+
"false|true|preserve",
116116
N_("incorporate changes by rebasing rather than merging"),
117117
PARSE_OPT_OPTARG, parse_opt_rebase },
118118
OPT_PASSTHRU('n', NULL, &opt_diffstat, NULL,

0 commit comments

Comments
 (0)