summaryrefslogtreecommitdiff
path: root/Documentation/git-diff-files.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-05-20 02:00:36 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-20 05:33:07 (GMT)
commit57fe64a40d95dd99d798c6d7c81c1a76d24a8e7c (patch)
tree8f12e1e6f5bf259b5118dc8cd4a22b23d6c9f32b /Documentation/git-diff-files.txt
parentdc26bd890d0a8571c38397e2ab33c0f3963c01a7 (diff)
downloadgit-57fe64a40d95dd99d798c6d7c81c1a76d24a8e7c.zip
git-57fe64a40d95dd99d798c6d7c81c1a76d24a8e7c.tar.gz
git-57fe64a40d95dd99d798c6d7c81c1a76d24a8e7c.tar.bz2
[PATCH] diff overhaul
This cleans up the way calls are made into the diff core from diff-tree family and diff-helper. Earlier, these programs had "if (generating_patch)" sprinkled all over the place, but those ugliness are gone and handled uniformly from the diff core, even when not generating patch format. This also allowed diff-cache and diff-files to acquire -R (reverse) option to generate diff in reverse. Users of diff-tree can swap two trees easily so I did not add -R there. [ Linus' note: I'll add -R to "diff-tree" too, since a "commit diff" doesn't have another tree to switch around: the other tree is always the parent(s) of the commit ] Also -M<digits-as-mantissa> suggestion made by Linus has been implemented. Documentation updates are also included. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'Documentation/git-diff-files.txt')
-rw-r--r--Documentation/git-diff-files.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt
index 166238f..f79820a 100644
--- a/Documentation/git-diff-files.txt
+++ b/Documentation/git-diff-files.txt
@@ -9,7 +9,7 @@ git-diff-files - Compares files in the working tree and the cache
SYNOPSIS
--------
-'git-diff-files' [-p] [-q] [-r] [-z] [-M] [<pattern>...]
+'git-diff-files' [-p] [-q] [-r] [-z] [-M] [-R] [<pattern>...]
DESCRIPTION
-----------
@@ -26,6 +26,9 @@ OPTIONS
-q::
Remain silent even on nonexisting files
+-R::
+ Output diff in reverse.
+
-M::
Detect renames; implies -p.