From: Matthieu Moy Date: Tue, 19 Oct 2010 13:20:30 GMT Subject: Re: [PATCH] gitk: add the equivalent of diff --color-words Message-ID: In-Reply-To: <20101017015836.GC26656@burratino> Jonathan Nieder writes: > 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. > > I like this a lot. +1, it's really a feature I was looking forward. > After this patch, the diff pane looks like this: > > ( ) Diff ( ) Old version ( ) New version Lines of context: [3 +/-] \ > [ ] Ignore space changes [ Line diff v] > > all on one line. In particular, it is easy not to notice the > new dropdown. Worse than that: if the window is not large enough, the select box "line diff/markup words/color words" is totally hidden. Is there a way to have the display wrap to 2 lines when the window is not large enough? -- Matthieu Moy http://www-verimag.imag.fr/~moy/