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/diff-format.txt | |
| parent | 99977bd5fdeabbd0608a70e9411c243007ec4ea2 (diff) | |
| download | git-215a7ad1ef790467a4cd3f0dcffbd6e5f04c38f7.tar.gz | |
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/diff-format.txt')
| -rw-r--r-- | Documentation/diff-format.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt index 811d143808..424e75a1c2 100644 --- a/Documentation/diff-format.txt +++ b/Documentation/diff-format.txt @@ -1,13 +1,13 @@ -The output format from "git-diff-cache", "git-diff-tree" and +The output format from "git-diff-index", "git-diff-tree" and "git-diff-files" are very similar. These commands all compare two sets of things; what are compared are different: -git-diff-cache <tree-ish>:: +git-diff-index <tree-ish>:: compares the <tree-ish> and the files on the filesystem. -git-diff-cache --cached <tree-ish>:: +git-diff-index --cached <tree-ish>:: compares the <tree-ish> and the cache. git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>...]:: @@ -58,7 +58,7 @@ Example: Generating patches with -p -------------------------- -When "git-diff-cache", "git-diff-tree", or "git-diff-files" are run +When "git-diff-index", "git-diff-tree", or "git-diff-files" are run with a '-p' option, they do not produce the output described above; instead they produce a patch file. @@ -77,7 +77,7 @@ The "diff" formatting options can be customized via the environment variable 'GIT_DIFF_OPTS'. For example, if you prefer context diff: - GIT_DIFF_OPTS=-c git-diff-cache -p $(cat .git/HEAD) + GIT_DIFF_OPTS=-c git-diff-index -p $(cat .git/HEAD) 2. When the environment variable 'GIT_EXTERNAL_DIFF' is set, the |