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

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
57 changed files with 88 additions and 90 deletions

View File

@ -1481,7 +1481,7 @@ int match_push_refs(struct ref *src, struct ref **dst,
/*
* Remote doesn't have it, and we have no
* explicit pattern, and we don't have
* --all nor --mirror.
* --all or --mirror.
*/
goto free_name;