Skip to content

Commit

Permalink
Documentation/git-diff: remove -r from --name-status example
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jeff King authored and Junio C Hamano committed Jul 29, 2007
1 parent 83b3df7 commit 90ae710
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions Documentation/git-diff.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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::
Expand Down

0 comments on commit 90ae710

Please sign in to comment.