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>
Ralf Thielow committed
Sep 11, 2015 at 17:53 UTC
7306b39f5ad6d8428cdb6caf7ce38bfc38ee091a
1 file changed
+1
-1
builtin/pull.c
+1
-1
@@ -112,7 +112,7 @@ static struct option pull_options[] = {
112
/* Options passed to git-merge or git-rebase */
113
OPT_GROUP(N_("Options related to merging")),
114
{ OPTION_CALLBACK, 'r', "rebase", &opt_rebase,
115
- N_("false|true|preserve"),
115
+ "false|true|preserve",
116
N_("incorporate changes by rebasing rather than merging"),
117
PARSE_OPT_OPTARG, parse_opt_rebase },
118
OPT_PASSTHRU('n', NULL, &opt_diffstat, NULL,