summaryrefslogtreecommitdiffstats
path: root/git-diff.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-04-08 12:48:38 -0700
committerJunio C Hamano <gitster@pobox.com>2014-04-08 12:48:38 -0700
commitd75148af8e54fe1d655796c75a601e5f79804808 (patch)
tree1aed2433cb2e2d7db853a72387f48ec081ce01dc /git-diff.txt
parent624dd4c072be7e13e57519eb729f35089386fec9 (diff)
downloadgit-htmldocs-d75148af8e54fe1d655796c75a601e5f79804808.tar.gz
Autogenerated HTML docs for v1.9.1-506-g7bf27
Diffstat (limited to 'git-diff.txt')
-rw-r--r--git-diff.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-diff.txt b/git-diff.txt
index 56fb7e532..bbab35fca 100644
--- a/git-diff.txt
+++ b/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.