On Wed, Apr 14, 2010 at 05:59:08PM +0200, Thomas Rast wrote: > Use the newly added 'diff --word-diff=porcelain' to teach gitk a > color-words mode, with two different modes analogous to the > --word-diff=plain and --word-diff=color settings. These are selected > by a dropdown box. > > As an extra twist, automatically enable this word-diff support when > the user mentions a word-diff related option on the command line. > These options were previously ignored because they would break diff > parsing. > > Both of these features are only enabled if we have a version of git > that supports --word-diff=porcelain, tentatively set to 1.7.2. > > Signed-off-by: Thomas Rast <trast@xxxxxxxxxxxxxxx> Looks fine. The only nit I can see is that a "--word-diffoobar" option would get treated as "--word-diff=plain" rather than giving an error or being passed as-is to git log. When does this need to go in, i.e. when is the git patch likely to go in? Paul. -- 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