So here's a version intended for application. [1/2] gained tests and docs. [2/2] now disables the word-diff code for merge commits, since the underlying --color-words also just gives up and shows a combined diff. It also patches /gitk, i.e., it's intended for application inside the subtree. I wasn't really sure about the last point -- this makes things a bit complicated since Paul will have to apply 2/2, and Junio will have to take care to only pull from Paul once 1/2 is in. Thomas Rast (2): Add diff --porcelain option for --color-words gitk: add the equivalent of diff --color-words -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html