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
index f136ee7bb5300966c0c3c9d2250dc81763db9feb,0000000000000000000000000000000000000000..16faa0781373bb3769ce9f0fa0a09be8c2b2ed81
mode 100755,000000..100755
--- 1/t/t7104-reset-hard.sh
--- /dev/null
+++ b/t/t7104-reset-hard.sh
@@@ -1,46 -1,0 +1,46 @@@
- test_expect_success 'reset --hard did not corrupt index nor cached-tree' '
 +#!/bin/sh
 +
 +test_description='reset --hard unmerged'
 +
 +. ./test-lib.sh
 +
 +test_expect_success setup '
 +
 +      mkdir before later &&
 +      >before/1 &&
 +      >before/2 &&
 +      >hello &&
 +      >later/3 &&
 +      git add before hello later &&
 +      git commit -m world &&
 +
 +      H=$(git rev-parse :hello) &&
 +      git rm --cached hello &&
 +      echo "100644 $H 2       hello" | git update-index --index-info &&
 +
 +      rm -f hello &&
 +      mkdir -p hello &&
 +      >hello/world &&
 +      test "$(git ls-files -o)" = hello/world
 +
 +'
 +
 +test_expect_success 'reset --hard should restore unmerged ones' '
 +
 +      git reset --hard &&
 +      git ls-files --error-unmatch before/1 before/2 hello later/3 &&
 +      test -f hello
 +
 +'
 +
++test_expect_success 'reset --hard did not corrupt index or cached-tree' '
 +
 +      T=$(git write-tree) &&
 +      rm -f .git/index &&
 +      git add before hello later &&
 +      U=$(git write-tree) &&
 +      test "$T" = "$U"
 +
 +'
 +
 +test_done

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