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

* 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 Makefile
Simple merge

diff --cc builtin/checkout.c
Simple merge

diff --cc builtin/commit.c
Simple merge

diff --cc remote.c
Simple merge