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 /Documentation/everyday.txt | |
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 'Documentation/everyday.txt')
-rw-r--r-- | Documentation/everyday.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/everyday.txt b/Documentation/everyday.txt index 2a18c1f6f..b2548ef4e 100644 --- a/Documentation/everyday.txt +++ b/Documentation/everyday.txt @@ -263,7 +263,7 @@ that are not quite ready. <5> create topic branch as needed and apply, again with my sign-offs. <6> rebase internal topic branch that has not been merged to the -master, nor exposed as a part of a stable branch. +master or exposed as a part of a stable branch. <7> restart `pu` every time from the next. <8> and bundle topic branches still cooking. <9> backport a critical fix. |