summaryrefslogtreecommitdiff
path: root/contrib/examples/git-reset.sh
diff options
context:
space:
mode:
authorJustin Lebar <jlebar@google.com>2014-03-31 22:11:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-03-31 22:29:27 (GMT)
commit01689909eb9f8366583c44b325d8d9ba259a2538 (patch)
tree6a4635a267885b3429f55c81a9a1c8787e36802e /contrib/examples/git-reset.sh
parente34b272344c1e7eb640dcce5990a75460240daed (diff)
downloadgit-01689909eb9f8366583c44b325d8d9ba259a2538.zip
git-01689909eb9f8366583c44b325d8d9ba259a2538.tar.gz
git-01689909eb9f8366583c44b325d8d9ba259a2538.tar.bz2
comments: fix misuses of "nor"
Signed-off-by: Justin Lebar <jlebar@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/examples/git-reset.sh')
-rwxr-xr-xcontrib/examples/git-reset.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/examples/git-reset.sh b/contrib/examples/git-reset.sh
index bafeb52..cb1bbf3 100755
--- a/contrib/examples/git-reset.sh
+++ b/contrib/examples/git-reset.sh
@@ -40,7 +40,7 @@ case "$1" in --) shift ;; esac
# git reset --mixed tree [--] paths... can be used to
# load chosen paths from the tree into the index without
-# affecting the working tree nor HEAD.
+# affecting the working tree or HEAD.
if test $# != 0
then
test "$reset_type" = "--mixed" ||
@@ -60,7 +60,7 @@ then
update=-u
fi
-# Soft reset does not touch the index file nor the working tree
+# Soft reset does not touch the index file or the working tree
# at all, but requires them in a good order. Other resets reset
# the index file to the tree object we are switching to.
if test "$reset_type" = "--soft"