diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-05-19 19:00:36 -0700 |
|---|---|---|
| committer |  Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-19 22:33:07 -0700 |
| commit | 57fe64a40d95dd99d798c6d7c81c1a76d24a8e7c (patch) | |
| tree | 8f12e1e6f5bf259b5118dc8cd4a22b23d6c9f32b /Documentation/git-diff-cache.txt | |
| parent | diff-tree: add "--root" flag to show a root commit as a big creation event. (diff) | |
| download | tgif-57fe64a40d95dd99d798c6d7c81c1a76d24a8e7c.tar.xz | |
[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-cache.txt')
| -rw-r--r-- | Documentation/git-diff-cache.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/git-diff-cache.txt b/Documentation/git-diff-cache.txt index 9cd6103334..bd8a6e5c5e 100644 --- a/Documentation/git-diff-cache.txt +++ b/Documentation/git-diff-cache.txt @@ -9,7 +9,7 @@ git-diff-cache - Compares content and mode of blobs between the cache and reposi SYNOPSIS -------- -'git-diff-cache' [-p] [-r] [-z] [-m] [-M] [--cached] <tree-ish> +'git-diff-cache' [-p] [-r] [-z] [-m] [-M] [-R] [--cached] <tree-ish> DESCRIPTION ----------- @@ -36,6 +36,9 @@ OPTIONS -M:: Detect renames; implies -p. +-R:: + Output diff in reverse. + --cached:: do not consider the on-disk file at all |