X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fdiffcore.txt;h=6c474d1c0c33748777a1ee28d5cd251489eb7c21;hb=a05ed8cb0c0179c732cfd7f99437e0a8ed9a8b39;hp=4ade0140cc12af5ec1eb3af6f4abe6a9cc9aca91;hpb=4a1332d04b676a226eba5a7c1247db199d463570;p=git.git

diff --git a/Documentation/diffcore.txt b/Documentation/diffcore.txt
index 4ade0140c..6c474d1c0 100644
--- a/Documentation/diffcore.txt
+++ b/Documentation/diffcore.txt
@@ -45,7 +45,7 @@ the -p option is not used.  E.g.
 The diffcore mechanism is fed a list of such comparison results
 (each of which is called "filepair", although at this point each
 of them talks about a single file), and transforms such a list
-into another list.  There are currently 7 such transformations:
+into another list.  There are currently 6 such transformations:
 
  - diffcore-pathspec
  - diffcore-break
@@ -150,15 +150,13 @@ similarity score different from the default 50% by giving a
 number after "-M" or "-C" option (e.g. "-M8" to tell it to use
 8/10 = 80%).
 
-Note.  When the "-C" option is used, git-diff-cache and
-git-diff-file commands feed not just modified filepairs but
-unmodified ones to diffcore mechanism as well.  This lets the
-copy detector consider unmodified files as copy source
-candidates at the expense of making it slower.  Currently
-git-diff-tree does not feed unmodified filepairs even when the
-"-C" option is used, so it can detect copies only if the file
-that was copied happened to have been modified in the same
-changeset.
+Note.  When the "-C" option is used with --find-copies-harder
+option, git-diff-* commands feed unmodified filepairs to
+diffcore mechanism as well as modified ones.  This lets the copy
+detector consider unmodified files as copy source candidates at
+the expense of making it slower.  Without --find-copies-harder,
+git-diff-* commands can detect copies only if the file that was
+copied happened to have been modified in the same changeset.
 
 
 diffcore-merge-broken
@@ -193,6 +191,15 @@ like these:
 	-B/60   (the same as above, since diffcore-break defautls to
 		 50%).
 
+Note that earlier implementation left a broken pair as a separate
+creation and deletion patches.  This was unnecessary hack and
+the latest implementation always merges all the broken pairs
+back into modifications, but the resulting patch output is
+formatted differently to still let the reviewing easier for such
+a complete rewrite by showing the entire contents of old version
+prefixed with '-', followed by the entire contents of new
+version prefixed with '+'.
+
 
 diffcore-pickaxe
 ----------------