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: https://git.lorimer.id.au/gitweb.git/diff_plain/d59c12d7ad39f942fc60578ba1e934822f40445b

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
diff --cc t/t7104-reset-hard.sh
index f136ee7bb5,0000000000..16faa07813
mode 100755,000000..100755
--- a/t/t7104-reset-hard.sh
+++ b/t/t7104-reset-hard.sh
@@@ -1,46 -1,0 +1,46 @@@
 +#!/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 nor cached-tree' '
++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