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/diff-options.txt | |
| parent | Merge branch 'mh/update-ref-batch-create-fix' (diff) | |
| parent | code and test: fix misuses of "nor" (diff) | |
| download | tgif-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/diff-options.txt')
| -rw-r--r-- | Documentation/diff-options.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 9b37b2a10b..6cb083aae5 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -358,7 +358,7 @@ endif::git-log[] --irreversible-delete:: Omit the preimage for deletes, i.e. print only the header but not the diff between the preimage and `/dev/null`. The resulting patch - is not meant to be applied with `patch` nor `git apply`; this is + is not meant to be applied with `patch` or `git apply`; this is solely for people who want to just concentrate on reviewing the text after the change. In addition, the output obviously lack enough information to apply such a patch in reverse, even manually, |