Merge branch 'maint'

[git.git] / Documentation / diffcore.txt

diff --git a/Documentation/diffcore.txt b/Documentation/diffcore.txt
index c9134def146c2ef98380de2af22799c1db04303f..34cd306bb1ee6ac73986cf3371114381b4165a0d 100644 (file)
--- 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
@@ -68,7 +65,7 @@ diff-patch format.
 
 
 diffcore-pathspec: For Ignoring Files Outside Our Consideration
------------------
+---------------------------------------------------------------
 
 The first transformation in the chain is diffcore-pathspec, and
 is controlled by giving the pathname parameters to the
@@ -92,7 +89,7 @@ use diffcore-pathspec, but the end result is the same.
 
 
 diffcore-break: For Splitting Up "Complete Rewrites"
---------------
+----------------------------------------------------
 
 The second transformation in the chain is diffcore-break, and is
 controlled by the -B option to the git-diff-* commands.  This is
@@ -127,7 +124,7 @@ after "-B" option (e.g. "-B75" to tell it to use 75%).
 
 
 diffcore-rename: For Detection Renames and Copies
----------------
+-------------------------------------------------
 
 This transformation is used to detect renames and copies, and is
 controlled by the -M option (to detect renames) and the -C option
@@ -185,7 +182,7 @@ copied happened to have been modified in the same changeset.
 
 
 diffcore-merge-broken: For Putting "Complete Rewrites" Back Together
----------------------
+--------------------------------------------------------------------
 
 This transformation is used to merge filepairs broken by
 diffcore-break, and not transformed into rename/copy by
@@ -227,7 +224,7 @@ version prefixed with '+'.
 
 
 diffcore-pickaxe: For Detecting Addition/Deletion of Specified String
-----------------
+---------------------------------------------------------------------
 
 This transformation is used to find filepairs that represent
 changes that touch a specified string, and is controlled by the
@@ -250,7 +247,7 @@ changeset easier.
 
 
 diffcore-order: For Sorting the Output Based on Filenames
---------------
+---------------------------------------------------------
 
 This is used to reorder the filepairs according to the user's
 (or project's) taste, and is controlled by the -O option to the