X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fdiffcore.txt;h=6c474d1c0c33748777a1ee28d5cd251489eb7c21;hb=89305da8a230e435109cc97ed88241c158813523;hp=7627453d9ad43c979caddaa8815d7905878e0c51;hpb=232b75ab3d60475b19270be022a966772c25c84b;p=git.git 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 ----------------