diff options
| author | Justin Lebar <jlebar@google.com> | 2014-04-01 02:11:47 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-01 02:29:33 +0400 |
| commit | 235e8d591480d7e1378c27fe65c5529625d4b5be (patch) | |
| tree | ecfd18463fa83687c6926852b373d8040d403234 /builtin | |
| parent | 01689909eb9f8366583c44b325d8d9ba259a2538 (diff) | |
code and test: fix misuses of "nor"
Signed-off-by: Justin Lebar <jlebar@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/clean.c | 6 | ||||
| -rw-r--r-- | builtin/commit.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/builtin/clean.c b/builtin/clean.c index 55029577f8..977a068f11 100644 --- a/builtin/clean.c +++ b/builtin/clean.c @@ -903,11 +903,11 @@ int cmd_clean(int argc, const char **argv, const char *prefix) if (!interactive && !dry_run && !force) { if (config_set) - die(_("clean.requireForce set to true and neither -i, -n nor -f given; " + die(_("clean.requireForce set to true and neither -i, -n, nor -f given; " "refusing to clean")); else - die(_("clean.requireForce defaults to true and neither -i, -n nor -f given; " - "refusing to clean")); + die(_("clean.requireForce defaults to true and neither -i, -n, nor -f given;" + " refusing to clean")); } if (force > 1) diff --git a/builtin/commit.c b/builtin/commit.c index 26b2986abe..5d594a4743 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1123,7 +1123,7 @@ static int parse_and_validate_options(int argc, const char *argv[], if (argc == 0 && only && amend) only_include_assumed = _("Clever... amending the last one with dirty index."); if (argc > 0 && !also && !only) - only_include_assumed = _("Explicit paths specified without -i nor -o; assuming --only paths..."); + only_include_assumed = _("Explicit paths specified without -i or -o; assuming --only paths..."); if (!cleanup_arg || !strcmp(cleanup_arg, "default")) cleanup_mode = use_editor ? CLEANUP_ALL : CLEANUP_SPACE; else if (!strcmp(cleanup_arg, "verbatim")) |