X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fdiffcore.txt;h=a0ffe85a25365974c2d3c17ec2cafe26d94602cf;hb=ee6566e8d70da682ac4926dd8a67ac821b2c1743;hp=1a6e725aaef3fd5a5cc37f29b2be9d6e54a8ece6;hpb=8db9307c9ca143fedaa972236054a5783c40bd37;p=git.git diff --git a/Documentation/diffcore.txt b/Documentation/diffcore.txt index 1a6e725a..a0ffe85a 100644 --- a/Documentation/diffcore.txt +++ b/Documentation/diffcore.txt @@ -6,7 +6,7 @@ June 2005 Introduction ------------ -The diff commands git-diff-cache, git-diff-files, and +The diff commands git-diff-index, git-diff-files, and git-diff-tree can be told to manipulate differences they find in unconventional ways before showing diff(1) output. The manipulation is collectively called "diffcore transformation". @@ -21,7 +21,7 @@ The chain of operation The git-diff-* family works by first comparing two sets of files: - - git-diff-cache compares contents of a "tree" object and the + - git-diff-index compares contents of a "tree" object and the working directory (when '--cached' flag is not used) or a "tree" object and the index file (when '--cached' flag is used);