summaryrefslogtreecommitdiff
path: root/builtin/pull.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-02-25 23:47:35 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-02-25 23:47:35 (GMT)
commitd21d5ddfe675f9dbcdbb94ab01776115a2d1fdde (patch)
tree3b0761ff79a4e4a5c50263a8d324b6c6a9268e35 /builtin/pull.c
parenta47fcfe8712e3258d1c565cd654c9bd5312a5168 (diff)
parent9164d97a63b31614a52571d708f1ef151b97db71 (diff)
downloadgit-d21d5ddfe675f9dbcdbb94ab01776115a2d1fdde.zip
git-d21d5ddfe675f9dbcdbb94ab01776115a2d1fdde.tar.gz
git-d21d5ddfe675f9dbcdbb94ab01776115a2d1fdde.tar.bz2
Merge branch 'ja/i18n-common-messages'
Unify more messages to help l10n. * ja/i18n-common-messages: i18n: fix some misformated placeholders in command synopsis i18n: remove from i18n strings that do not hold translatable parts i18n: factorize "invalid value" messages i18n: factorize more 'incompatible options' messages
Diffstat (limited to 'builtin/pull.c')
-rw-r--r--builtin/pull.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/pull.c b/builtin/pull.c
index 3768552..4d667ab 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -42,9 +42,9 @@ static enum rebase_type parse_config_rebase(const char *key, const char *value,
return v;
if (fatal)
- die(_("Invalid value for %s: %s"), key, value);
+ die(_("invalid value for '%s': '%s'"), key, value);
else
- error(_("Invalid value for %s: %s"), key, value);
+ error(_("invalid value for '%s': '%s'"), key, value);
return REBASE_INVALID;
}
@@ -318,7 +318,7 @@ static const char *config_get_ff(void)
if (!strcmp(value, "only"))
return "--ff-only";
- die(_("Invalid value for pull.ff: %s"), value);
+ die(_("invalid value for '%s': '%s'"), "pull.ff", value);
}
/**