diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-02-07 17:03:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-12 19:33:03 -0800 |
| commit | 4cc41a16c15a6d73b13f9211eb8bf49ec869705f (patch) | |
| tree | f3d46f67a17f0771def2269a2ce07cf26dc45d97 /Documentation/diffcore.txt | |
| parent | Remove git-resolve. (diff) | |
| download | tgif-4cc41a16c15a6d73b13f9211eb8bf49ec869705f.tar.xz | |
Remove git-diff-stages.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/diffcore.txt')
| -rw-r--r-- | Documentation/diffcore.txt | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Documentation/diffcore.txt b/Documentation/diffcore.txt index cb4e562004..34cd306bb1 100644 --- a/Documentation/diffcore.txt +++ b/Documentation/diffcore.txt @@ -6,8 +6,8 @@ June 2005 Introduction ------------ -The diff commands git-diff-index, git-diff-files, git-diff-tree, and -git-diff-stages can be told to manipulate differences they find in +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". This short note describes what they are and how to use them to produce diff outputs @@ -30,9 +30,6 @@ files: - git-diff-tree compares contents of two "tree" objects; - - git-diff-stages compares contents of blobs at two stages in an - unmerged index file. - In all of these cases, the commands themselves compare corresponding paths in the two sets of files. The result of comparison is passed from these commands to what is internally |