Remove MERGE_HEAD in "git checkout/reset"

diff --git a/Documentation/diffcore.txt b/Documentation/diffcore.txt
index 7627453d9ad43c979caddaa8815d7905878e0c51..6c474d1c0c33748777a1ee28d5cd251489eb7c21 100644 (file)
--- 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
 ----------------