mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jl/nor-or-nand-and'

Browse Source 
Eradicate mistaken use of "nor" (that is, essentially "nor" used
not in "neither A nor B" ;-)) from in-code comments, command output
strings, and documentations.

* jl/nor-or-nand-and:
  code and test: fix misuses of "nor"
  comments: fix misuses of "nor"
  contrib: fix misuses of "nor"
  Documentation: fix misuses of "nor"
This commit is contained in:
Junio C Hamano
2014-04-08 12:00:27 -07:00
parent 9b30a0339d 235e8d5914
commit d59c12d7ad
57 changed files with 88 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/clean.c
View File

@ -904,11 +904,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)