From 01689909eb9f8366583c44b325d8d9ba259a2538 Mon Sep 17 00:00:00 2001 From: Justin Lebar Date: Mon, 31 Mar 2014 15:11:46 -0700 Subject: comments: fix misuses of "nor" Signed-off-by: Justin Lebar Signed-off-by: Junio C Hamano --- contrib/examples/git-reset.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'contrib/examples/git-reset.sh') diff --git a/contrib/examples/git-reset.sh b/contrib/examples/git-reset.sh index bafeb52cd1..cb1bbf3b90 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" -- cgit 1.2.3-korg