Merge branch 'jl/nor-or-nand-and'
authorJunio C Hamano <gitster@pobox.com>
Tue, 8 Apr 2014 19:00:27 +0000 (8 12:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 Apr 2014 19:00:28 +0000 (8 12:00 -0700)
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"

21 files changed:
1  2 
Documentation/CodingGuidelines
Documentation/config.txt
Documentation/git-add.txt
Documentation/git-push.txt
Documentation/git-reset.txt
Documentation/rev-list-options.txt
Makefile
builtin/apply.c
builtin/checkout.c
builtin/clean.c
builtin/commit.c
builtin/pack-objects.c
diff.c
git-add--interactive.perl
git-am.sh
gitweb/gitweb.perl
http.h
remote.c
sha1_file.c
t/t7104-reset-hard.sh
t/t9400-git-cvsserver-server.sh

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc Makefile
Simple merge
diff --cc builtin/apply.c
Simple merge
Simple merge
diff --cc builtin/clean.c
Simple merge
Simple merge
Simple merge
diff --cc diff.c
Simple merge
Simple merge
diff --cc git-am.sh
Simple merge
Simple merge
diff --cc http.h
Simple merge
diff --cc remote.c
Simple merge
diff --cc sha1_file.c
Simple merge
Simple merge
Simple merge