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-checkout.sh | |
| parent | 9b30a0339db28e6de9653b5631247d398cce626c (diff) | |
| parent | 235e8d591480d7e1378c27fe65c5529625d4b5be (diff) | |
| download | git-d59c12d7ad39f942fc60578ba1e934822f40445b.tar.gz git-d59c12d7ad39f942fc60578ba1e934822f40445b.tar.xz | |
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-checkout.sh')
| -rwxr-xr-x | contrib/examples/git-checkout.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/examples/git-checkout.sh b/contrib/examples/git-checkout.sh index 1a7689a48..d2c1f98b8 100755 --- a/contrib/examples/git-checkout.sh +++ b/contrib/examples/git-checkout.sh @@ -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= |