aboutsummaryrefslogtreecommitdiff
path: root/contrib/examples
diff options
context:
space:
mode:
authorJustin Lebar <jlebar@google.com>2014-03-31 15:11:45 -0700
committerJunio C Hamano <gitster@pobox.com>2014-03-31 15:17:56 -0700
commite34b272344c1e7eb640dcce5990a75460240daed (patch)
treeae0fc191413c1725230c2e85359f28113d3f697f /contrib/examples
parenta58088abe2011b6f486de8acd54432f6d9bcecfc (diff)
downloadgit-e34b272344c1e7eb640dcce5990a75460240daed.tar.gz
git-e34b272344c1e7eb640dcce5990a75460240daed.tar.xz
contrib: 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')
-rwxr-xr-xcontrib/examples/git-commit.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/examples/git-commit.sh b/contrib/examples/git-commit.sh
index 23ffb028d..4aab1a6d2 100755
--- a/contrib/examples/git-commit.sh
+++ b/contrib/examples/git-commit.sh
@@ -280,7 +280,7 @@ case "$#,$also,$only,$amend" in
0,,,*)
;;
*,,,*)
- only_include_assumed="# Explicit paths specified without -i nor -o; assuming --only paths..."
+ only_include_assumed="# Explicit paths specified without -i or -o; assuming --only paths..."
also=
;;
esac