From: Ralf Thielow Date: Fri, 11 Sep 2015 15:53:17 +0000 (+0200) Subject: pull: don't mark values for option "rebase" for translation X-Git-Tag: v2.6.0-rc3~13^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7306b39f5ad6d8428cdb6caf7ce38bfc38ee091a;p=thirdparty%2Fgit.git 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 Signed-off-by: Junio C Hamano --- diff --git a/builtin/pull.c b/builtin/pull.c index 7e3c11ea63..a39bb0a11f 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -112,7 +112,7 @@ static struct option pull_options[] = { /* Options passed to git-merge or git-rebase */ OPT_GROUP(N_("Options related to merging")), { OPTION_CALLBACK, 'r', "rebase", &opt_rebase, - N_("false|true|preserve"), + "false|true|preserve", N_("incorporate changes by rebasing rather than merging"), PARSE_OPT_OPTARG, parse_opt_rebase }, OPT_PASSTHRU('n', NULL, &opt_diffstat, NULL,