diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-04-08 12:00:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-08 12:00:28 -0700 |
| commit | d59c12d7ad39f942fc60578ba1e934822f40445b (patch) | |
| tree | f0591d6490164e7a8a672c79094a2d612899cfb7 /contrib/examples/git-commit.sh | |
| parent | 9b30a0339db28e6de9653b5631247d398cce626c (diff) | |
| parent | 235e8d591480d7e1378c27fe65c5529625d4b5be (diff) | |
| download | git-d59c12d7ad39f942fc60578ba1e934822f40445b.tar.gz | |
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"
Diffstat (limited to 'contrib/examples/git-commit.sh')
| -rwxr-xr-x | contrib/examples/git-commit.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/examples/git-commit.sh b/contrib/examples/git-commit.sh index 23ffb028d1..4aab1a6d21 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 |