diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-04-09 12:03:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-09 12:03:26 -0700 |
| commit | 3c9e56b75c4a9a6832d94a00f079ea68e8a281ca (patch) | |
| tree | 5f5b11703f64319bcb71603c825d382f4703a763 /Documentation/git-diff.txt | |
| parent | Merge branch 'cn/fetch-prune-overlapping-destination' into maint (diff) | |
| parent | code and test: fix misuses of "nor" (diff) | |
| download | tgif-3c9e56b75c4a9a6832d94a00f079ea68e8a281ca.tar.xz | |
Merge branch 'jl/nor-or-nand-and' into maint
* 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/git-diff.txt')
| -rw-r--r-- | Documentation/git-diff.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index 56fb7e5322..bbab35fcaf 100644 --- a/Documentation/git-diff.txt +++ b/Documentation/git-diff.txt @@ -158,8 +158,8 @@ $ git diff --name-status <2> $ git diff arch/i386 include/asm-i386 <3> ------------ + -<1> Show only modification, rename and copy, but not addition -nor deletion. +<1> Show only modification, rename, and copy, but not addition +or deletion. <2> Show only names and the nature of change, but not actual diff output. <3> Limit diff output to named subtrees. |