diff options
author | Justin Lebar <jlebar@google.com> | 2014-03-31 15:11:44 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-03-31 15:16:22 -0700 |
commit | a58088abe2011b6f486de8acd54432f6d9bcecfc (patch) | |
tree | fdae618dee73d4a349c80321896d4f4a58344c35 /Documentation/diff-options.txt | |
parent | cee0c2750bb5f1b38f15ef961517e03c2e39c9ec (diff) | |
download | git-a58088abe2011b6f486de8acd54432f6d9bcecfc.tar.gz git-a58088abe2011b6f486de8acd54432f6d9bcecfc.tar.xz |
Documentation: fix misuses of "nor"
Signed-off-by: Justin Lebar <jlebar@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 9b37b2a10..6cb083aae 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, |