From 366175ef8c3b1e145f4ba846e63a1dea3ec3cacc Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 19 Jun 2005 13:17:50 -0700 Subject: [PATCH] Rework -B output. Patch for a completely rewritten file detected by the -B flag was shown as a pair of creation followed by deletion in earlier versions. This was an misguided attempt to make reviewing such a complete rewrite easier, and unnecessarily ended up confusing git-apply. Instead, show the entire contents of old version prefixed with '-', followed by the entire contents of new version prefixed with '+'. This gives the same easy-to-review for human consumer while keeping it a single, regular modification patch for machine consumption, something that even GNU patch can grok. Signed-off-by: Junio C Hamano Signed-off-by: Linus Torvalds --- Documentation/diffcore.txt | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'Documentation') diff --git a/Documentation/diffcore.txt b/Documentation/diffcore.txt index 7627453d9a..6c474d1c0c 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 ---------------- -- cgit v1.2.3