Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Documentation/git-diff: remove -r from --name-status example
author
Jeff King
<peff@peff.net>
Sun, 29 Jul 2007 00:24:27 +0000
(20:24 -0400)
committer
Junio C Hamano
<gitster@pobox.com>
Sun, 29 Jul 2007 01:44:52 +0000
(18:44 -0700)
Calling 'git-diff --name-status' will recursively show any
changes already, and it has for quite some time (at least as
far back as v1.4.1).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-diff.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
83b3df7
)
diff --git
a/Documentation/git-diff.txt
b/Documentation/git-diff.txt
index 639b969315d4c9c6ece95cdeb10c2f92bd17adab..b1f5e7f93f4f394c42915e345f6b0f9d33fc41d9 100644
(file)
--- a/
Documentation/git-diff.txt
+++ b/
Documentation/git-diff.txt
@@
-102,17
+102,14
@@
Limiting the diff output::
+
------------
$ git diff --diff-filter=MRC <1>
+
------------
$ 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
$ 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::
<3> limit diff output to named subtrees.
Munging the diff output::