diff options
| author |  Jeff King <peff@peff.net> | 2007-07-28 20:24:27 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2007-07-28 18:44:52 -0700 |
| commit | 90ae710e0b642b177d44df4528966c7ae37ebf5f (patch) | |
| tree | 4016d315ae232bb51a69ef1f20ef261ddbbcc934 /Documentation | |
| parent | git-stash apply --index: optimize postprocessing (diff) | |
| download | tgif-90ae710e0b642b177d44df4528966c7ae37ebf5f.tar.xz | |
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: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-diff.txt | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index 639b969315..b1f5e7f93f 100644 --- 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 --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:: |