summaryrefslogtreecommitdiffstats
path: root/git-diff.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2007-07-30 09:07:17 +0000
committerJunio C Hamano <junio@hera.kernel.org>2007-07-30 09:07:17 +0000
commitbdeff822de152c9855766ea84cfd2534ebc19f52 (patch)
tree9a5ecf30791c00cd28cded8b040f968db93e3686 /git-diff.txt
parentb968dbbd6a939fc1282a7837026e131ed921e122 (diff)
downloadgit-htmldocs-bdeff822de152c9855766ea84cfd2534ebc19f52.tar.gz
Autogenerated HTML docs for v1.5.3-rc3-91-g5c75
Diffstat (limited to 'git-diff.txt')
-rw-r--r--git-diff.txt7
1 files changed, 2 insertions, 5 deletions
diff --git a/git-diff.txt b/git-diff.txt
index 639b96931..b1f5e7f93 100644
--- a/git-diff.txt
+++ b/git-diff.txt
@@ -102,17 +102,14 @@ Limiting the diff output::
+
------------
$ git diff --diff-filter=MRC <1>
-$ git diff --name-status -r <2>
+$ 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.
<2> show only names and the nature of change, but not actual
-diff output. --name-status disables usual patch generation
-which in turn also disables recursive behavior, so without -r
-you would only see the directory name if there is a change in a
-file in a subdirectory.
+diff output.
<3> limit diff output to named subtrees.
Munging the diff output::