aboutsummaryrefslogtreecommitdiff
path: root/Documentation/diffcore.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/diffcore.txt')
-rw-r--r--Documentation/diffcore.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/diffcore.txt b/Documentation/diffcore.txt
index 7627453d9..6c474d1c0 100644
--- a/Documentation/diffcore.txt
+++ b/Documentation/diffcore.txt
@@ -191,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
----------------