diff options
| author | Jean-Noël Avila <jn.avila@free.fr> | 2022-01-05 20:02:14 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-01-05 13:29:23 -0800 |
| commit | 43ea635c35371b22a7a2010398d47040c5b95adc (patch) | |
| tree | 39fdf40eba05aba61c7bf2fcfae638bdd66abc09 /builtin/log.c | |
| parent | The fifth batch (diff) | |
| download | git-43ea635c35371b22a7a2010398d47040c5b95adc.tar.gz git-43ea635c35371b22a7a2010398d47040c5b95adc.zip | |
i18n: refactor "foo and bar are mutually exclusive"
Use static strings for constant parts of the sentences. They are all
turned into "cannot be used together".
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
Reviewed-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/log.c')
| -rw-r--r-- | builtin/log.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/log.c b/builtin/log.c index 93ace0dde7..fad93ad2fc 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1943,9 +1943,9 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) numbered = 0; if (numbered && keep_subject) - die(_("-n and -k are mutually exclusive")); + die(_("options '%s' and '%s' cannot be used together"), "-n", "-k"); if (keep_subject && subject_prefix) - die(_("--subject-prefix/--rfc and -k are mutually exclusive")); + die(_("options '%s' and '%s' cannot be used together"), "--subject-prefix/--rfc", "-k"); rev.preserve_subject = keep_subject; argc = setup_revisions(argc, argv, &rev, &s_r_opt); |