diff options
| author |  Jean-Noël Avila <jn.avila@free.fr> | 2019-02-11 07:44:53 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-02-11 12:58:06 -0800 |
| commit | 32ceace39fa224e8e01c791d441b1dd411ba2aba (patch) | |
| tree | c25a3bff99ee43a67f8f509875f02be219249acc | |
| parent | Seventh batch for 2.21 (diff) | |
| download | tgif-32ceace39fa224e8e01c791d441b1dd411ba2aba.tar.xz | |
Fix typos in translatable strings for v2.21.0
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/bisect--helper.c | 4 | ||||
| -rw-r--r-- | builtin/fetch.c | 2 | ||||
| -rw-r--r-- | builtin/rebase.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c index c1cff32661..e7325fe37f 100644 --- a/builtin/bisect--helper.c +++ b/builtin/bisect--helper.c @@ -173,7 +173,7 @@ static int bisect_reset(const char *commit) argv_array_clear(&argv); return error(_("could not check out original" " HEAD '%s'. Try 'git bisect" - "reset <commit>'."), branch.buf); + " reset <commit>'."), branch.buf); } argv_array_clear(&argv); } @@ -646,7 +646,7 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix) OPT_BOOL(0, "no-checkout", &no_checkout, N_("update BISECT_HEAD instead of checking out the current commit")), OPT_BOOL(0, "no-log", &nolog, - N_("no log for BISECT_WRITE ")), + N_("no log for BISECT_WRITE")), OPT_END() }; struct bisect_terms terms = { .term_good = NULL, .term_bad = NULL }; diff --git a/builtin/fetch.c b/builtin/fetch.c index 5a09fe24cd..b620fd54b4 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -1480,7 +1480,7 @@ static inline void fetch_one_setup_partial(struct remote *remote) if (strcmp(remote->name, repository_format_partial_clone)) { if (filter_options.choice) die(_("--filter can only be used with the remote " - "configured in extensions.partialclone")); + "configured in extensions.partialClone")); return; } diff --git a/builtin/rebase.c b/builtin/rebase.c index 96efd40901..7c7bc13e91 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1434,7 +1434,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) } if (options.reschedule_failed_exec && !is_interactive(&options)) - die(_("--reschedule-failed-exec requires an interactive rebase")); + die(_("%s requires an interactive rebase"), "--reschedule-failed-exec"); if (options.git_am_opts.argc) { /* all am options except -q are compatible only with --am */ |