diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-04-08 19:00:27 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-04-08 19:00:28 (GMT) |
commit | d59c12d7ad39f942fc60578ba1e934822f40445b (patch) | |
tree | f0591d6490164e7a8a672c79094a2d612899cfb7 /Documentation/howto/revert-branch-rebase.txt | |
parent | 9b30a0339db28e6de9653b5631247d398cce626c (diff) | |
parent | 235e8d591480d7e1378c27fe65c5529625d4b5be (diff) | |
download | git-d59c12d7ad39f942fc60578ba1e934822f40445b.zip git-d59c12d7ad39f942fc60578ba1e934822f40445b.tar.gz git-d59c12d7ad39f942fc60578ba1e934822f40445b.tar.bz2 |
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/howto/revert-branch-rebase.txt')
-rw-r--r-- | Documentation/howto/revert-branch-rebase.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/howto/revert-branch-rebase.txt b/Documentation/howto/revert-branch-rebase.txt index 85f69db..149508e 100644 --- a/Documentation/howto/revert-branch-rebase.txt +++ b/Documentation/howto/revert-branch-rebase.txt @@ -137,7 +137,7 @@ $ make clean test ;# make sure it did not cause other breakage. ------------------------------------------------ Everything is in the good order. I do not need the temporary branch -nor tag anymore, so remove them: +or tag anymore, so remove them: ------------------------------------------------ $ rm -f .git/refs/tags/pu-anchor |