From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 8 Apr 2014 19:00:27 +0000 (-0700)
Subject: Merge branch 'jl/nor-or-nand-and'
X-Git-Tag: v2.0.0-rc0~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d59c12d7ad39f942fc60578ba1e934822f40445b;p=thirdparty%2Fgit.git

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"
---

d59c12d7ad39f942fc60578ba1e934822f40445b