[PATCH] pull: don't mark values for option "rebase" for translation
- From
Ralf Thielow <ralf.thielow@gmail.com>
- Date
- Sep 11, 2015, 15:53 UTC
- Message-ID
- <1441986797-21734-1-git-send-email-ralf.thielow@gmail.com>
"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> --- builtin/pull.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/pull.c b/builtin/pull.c index 7e3c11e..a39bb0a 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,
-- 2.6.0.rc1.199.g678474c