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"

diff --cc Documentation/CodingGuidelines
Simple merge

diff --cc Documentation/config.txt
Simple merge

diff --cc Documentation/git-add.txt
Simple merge

diff --cc Documentation/git-push.txt
Simple merge

diff --cc Documentation/git-reset.txt
Simple merge

diff --cc Documentation/rev-list-options.txt
Simple merge

diff --cc Makefile
Simple merge

diff --cc builtin/apply.c
Simple merge

diff --cc builtin/checkout.c
Simple merge

diff --cc builtin/clean.c
Simple merge

diff --cc builtin/commit.c
Simple merge

diff --cc builtin/pack-objects.c
Simple merge

diff --cc diff.c
Simple merge

diff --cc git-add--interactive.perl
Simple merge

diff --cc git-am.sh
Simple merge

diff --cc gitweb/gitweb.perl
Simple merge

diff --cc http.h
Simple merge

diff --cc remote.c
Simple merge

diff --cc sha1_file.c
Simple merge

diff --cc t/t7104-reset-hard.sh
Simple merge

diff --cc t/t9400-git-cvsserver-server.sh
Simple merge