i18n: turn "options are incompatible" 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>
This commit is contained in:

committed by
Junio C Hamano

parent
c488182903
commit
12909b6b8a
@ -507,9 +507,9 @@ int cmd_add(int argc, const char **argv, const char *prefix)
|
||||
add_interactive = 1;
|
||||
if (add_interactive) {
|
||||
if (show_only)
|
||||
die(_("--dry-run is incompatible with --interactive/--patch"));
|
||||
die(_("options '%s' and '%s' cannot be used together"), "--dry-run", "--interactive/--patch");
|
||||
if (pathspec_from_file)
|
||||
die(_("--pathspec-from-file is incompatible with --interactive/--patch"));
|
||||
die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "--interactive/--patch");
|
||||
exit(interactive_add(argv + 1, prefix, patch_interactive));
|
||||
}
|
||||
if (legacy_stash_p) {
|
||||
@ -526,7 +526,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
|
||||
|
||||
if (edit_interactive) {
|
||||
if (pathspec_from_file)
|
||||
die(_("--pathspec-from-file is incompatible with --edit"));
|
||||
die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "--edit");
|
||||
return(edit_patch(argc, argv, prefix));
|
||||
}
|
||||
argc--;
|
||||
@ -538,7 +538,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
|
||||
addremove = 0; /* "-u" was given but not "-A" */
|
||||
|
||||
if (addremove && take_worktree_changes)
|
||||
die(_("-A and -u are mutually incompatible"));
|
||||
die(_("options '%s' and '%s' cannot be used together"), "-A", "-u");
|
||||
|
||||
if (!show_only && ignore_missing)
|
||||
die(_("Option --ignore-missing can only be used together with --dry-run"));
|
||||
|
Reference in New Issue
Block a user