From: Jonathan Nieder Date: Sun, 17 Oct 2010 01:58:36 GMT Subject: Re: [PATCH] gitk: add the equivalent of diff --color-words Message-ID: <20101017015836.GC26656@burratino> In-Reply-To: <3c06517d478b3725054f4ca08fb8c38e681549c4.1287223650.git.trast@student.ethz.ch> 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. 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. One might be tempted to change the Elide added lines/Elide removed lines radio buttons into a dropdown box, but that would remove the neat-o ability to switch between "before" and "after" views with a single click. Oh well --- screens are getting bigger, anyway.