diff options
author | Junio C Hamano <junkio@cox.net> | 2005-09-07 17:26:23 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2005-09-07 17:45:20 -0700 |
commit | 215a7ad1ef790467a4cd3f0dcffbd6e5f04c38f7 (patch) | |
tree | 6bc7aa4f652d0ef49108d9e30a7ea7fbf8e44639 /Documentation/diffcore.txt | |
parent | 99977bd5fdeabbd0608a70e9411c243007ec4ea2 (diff) | |
download | git-215a7ad1ef790467a4cd3f0dcffbd6e5f04c38f7.tar.gz git-215a7ad1ef790467a4cd3f0dcffbd6e5f04c38f7.tar.xz |
Big tool rename.
As promised, this is the "big tool rename" patch. The primary differences
since 0.99.6 are:
(1) git-*-script are no more. The commands installed do not
have any such suffix so users do not have to remember if
something is implemented as a shell script or not.
(2) Many command names with 'cache' in them are renamed with
'index' if that is what they mean.
There are backward compatibility symblic links so that you and
Porcelains can keep using the old names, but the backward
compatibility support is expected to be removed in the near
future.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/diffcore.txt')
-rw-r--r-- | Documentation/diffcore.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/diffcore.txt b/Documentation/diffcore.txt index 1a6e725aa..a0ffe85a2 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); |