mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

comments: fix misuses of "nor"

Browse Source 
Signed-off-by: Justin Lebar <jlebar@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Justin Lebar
2014-03-31 15:11:46 -07:00
committed by Junio C Hamano
parent e34b272344
commit 01689909eb
20 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/examples/git-checkout.sh
View File

@ -168,7 +168,7 @@ cd_to_toplevel
# branch. However, if "git checkout HEAD" detaches the HEAD
# from the current branch, even though that may be logically
# correct, it feels somewhat funny. More importantly, we do not
# want "git checkout" nor "git checkout -f" to detach HEAD.
# want "git checkout" or "git checkout -f" to detach HEAD.
detached=
detach_warn=

4
contrib/examples/git-reset.sh
View File

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