X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fdiffcore.txt;h=9d20a4ff19bc42497b15220cb3ad5a04594f6753;hb=babfaba23d530e2818db62161825a65e582adbdc;hp=1908b92f3804c9d0e5951ee8050c1de312fb30a4;hpb=e1ccf53a60657930ae7892387736c8b6a91ec610;p=git.git diff --git a/Documentation/diffcore.txt b/Documentation/diffcore.txt index 1908b92f..9d20a4ff 100644 --- a/Documentation/diffcore.txt +++ b/Documentation/diffcore.txt @@ -177,7 +177,7 @@ diffcore-merge-broken --------------------- This transformation is used to merge filepairs broken by -diffcore-break, and were not transformed into rename/copy by +diffcore-break, and not transformed into rename/copy by diffcore-rename, back into a single modification. This always runs when diffcore-break is used. @@ -206,10 +206,10 @@ like these: * -B/60 (the same as above, since diffcore-break defaults to 50%). Note that earlier implementation left a broken pair as a separate -creation and deletion patches. This was unnecessary hack and +creation and deletion patches. This was an 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 +formatted differently for easier review in case of such a complete rewrite by showing the entire contents of old version prefixed with '-', followed by the entire contents of new version prefixed with '+'. @@ -254,11 +254,11 @@ As an example, typical orderfile for the core GIT probably would look like this: ------------------------------------------------ - README - Makefile - Documentation - *.h - *.c - t +README +Makefile +Documentation +*.h +*.c +t ------------------------------------------------