提交 90ae710e 编写于 作者: J Jeff King 提交者: Junio C Hamano

Documentation/git-diff: remove -r from --name-status example

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: NJeff King <peff@peff.net>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 83b3df7d
...@@ -102,17 +102,14 @@ Limiting the diff output:: ...@@ -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> $ git diff arch/i386 include/asm-i386 <3>
------------ ------------
+ +
<1> show only modification, rename and copy, but not addition <1> show only modification, rename and copy, but not addition
nor deletion. nor deletion.
<2> show only names and the nature of change, but not actual <2> show only names and the nature of change, but not actual
diff output. --name-status disables usual patch generation diff output.
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.
<3> limit diff output to named subtrees. <3> limit diff output to named subtrees.
Munging the diff output:: Munging the diff output::
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册